From b22c590a546b2ea5f256e7654c4a6b165b320e80 Mon Sep 17 00:00:00 2001 From: Julien Cristau Date: Fri, 8 May 2015 13:40:46 +0200 Subject: Fix a couple const-ness warnings smi_accel.c: In function 'SMI_GEReset': smi_accel.c:51:1: warning: passing argument 4 of 'SMI_GEReset' discards 'const' qualifier from pointer target type WaitIdle(); ^ smi_accel.c:38:1: note: expected 'char *' but argument is of type 'const char *' SMI_GEReset(ScrnInfoPtr pScrn, int from_timeout, int line, char *file) ^ [...] smi_driver.c: In function 'SMI_DetectPanelSize': smi_driver.c:1011:12: warning: assignment discards 'const' qualifier from pointer target type if ((s = xf86GetOptValString(pSmi->Options, OPTION_PANEL_SIZE)) != NULL) { ^ Signed-off-by: Julien Cristau --- src/smi.h | 2 +- src/smi_accel.c | 2 +- src/smi_driver.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/smi.h b/src/smi.h index e03a0c9..5e44892 100644 --- a/src/smi.h +++ b/src/smi.h @@ -372,7 +372,7 @@ Bool SMI_I2CInit(ScrnInfoPtr pScrn); /* smi_accel.c */ void SMI_AccelSync(ScrnInfoPtr pScrn); -void SMI_GEReset(ScrnInfoPtr pScrn, int from_timeout, int line, char *file); +void SMI_GEReset(ScrnInfoPtr pScrn, int from_timeout, int line, const char *file); void SMI_EngineReset(ScrnInfoPtr); void SMI_SetClippingRectangle(ScrnInfoPtr, int, int, int, int); void SMI_DisableClipping(ScrnInfoPtr); diff --git a/src/smi_accel.c b/src/smi_accel.c index b6a3b35..61a686d 100644 --- a/src/smi_accel.c +++ b/src/smi_accel.c @@ -35,7 +35,7 @@ authorization from the XFree86 Project and silicon Motion. #include "smi_501.h" void -SMI_GEReset(ScrnInfoPtr pScrn, int from_timeout, int line, char *file) +SMI_GEReset(ScrnInfoPtr pScrn, int from_timeout, int line, const char *file) { SMIPtr pSmi = SMIPTR(pScrn); int32_t tmp; diff --git a/src/smi_driver.c b/src/smi_driver.c index 1c0b355..2568637 100644 --- a/src/smi_driver.c +++ b/src/smi_driver.c @@ -1002,7 +1002,7 @@ SMI_LeaveVT(VT_FUNC_ARGS_DECL) static void SMI_DetectPanelSize(ScrnInfoPtr pScrn) { - char *s; + const char *s; int width, height; SMIPtr pSmi = SMIPTR(pScrn); -- cgit v1.2.3