powerpc/windfarm: don't pass const strings to snprintf
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 2 May 2012 20:19:43 +0000 (20:19 +0000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Thu, 3 May 2012 06:54:54 +0000 (16:54 +1000)
Fixes these build warnings:

drivers/macintosh/windfarm_smu_sat.c: In function 'wf_sat_probe':
drivers/macintosh/windfarm_smu_sat.c:290:3: warning: passing argument 1 of 'snprintf' discards qualifiers from pointer target type
include/linux/kernel.h:323:5: note: expected 'char *' but argument is of type 'const char *'
drivers/macintosh/windfarm_smu_sat.c:317:3: warning: passing argument 1 of 'snprintf' discards qualifiers from pointer target type
include/linux/kernel.h:323:5: note: expected 'char *' but argument is of type 'const char *'

Introduced by commit e074d08e2b98 ("powerpc/windfarm: const'ify and add
"priv" field to controls & sensors").

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
drivers/macintosh/windfarm_smu_sat.c

index 72dfe19..e2989ce 100644 (file)
@@ -287,7 +287,7 @@ static int wf_sat_probe(struct i2c_client *client,
                sens->sat = sat;
                sens->sens.ops = &wf_sat_ops;
                sens->sens.name = (char *) (sens + 1);
-               snprintf(sens->sens.name, 16, "%s-%d", name, cpu);
+               snprintf((char *)sens->sens.name, 16, "%s-%d", name, cpu);
 
                if (wf_register_sensor(&sens->sens))
                        kfree(sens);
@@ -314,7 +314,7 @@ static int wf_sat_probe(struct i2c_client *client,
                sens->sat = sat;
                sens->sens.ops = &wf_sat_ops;
                sens->sens.name = (char *) (sens + 1);
-               snprintf(sens->sens.name, 16, "cpu-power-%d", cpu);
+               snprintf((char *)sens->sens.name, 16, "cpu-power-%d", cpu);
 
                if (wf_register_sensor(&sens->sens))
                        kfree(sens);