OSDN Git Service

regulator: tps6586x: silence pointer-to-int-cast
authorDaniel Kurtz <djkurtz@chromium.org>
Wed, 22 Jul 2015 10:23:26 +0000 (18:23 +0800)
committerMark Brown <broonie@kernel.org>
Thu, 23 Jul 2015 14:58:33 +0000 (15:58 +0100)
of_regulator_match.driver_data is (void *).  tps6586x uses it to store an
anonymous enum value (those TPS6586X_ID_ values).

Later, it tries to extract the ID by casting directly to an int, which is a
no-no ([-Wpointer-to-int-cast]):

drivers/regulator/tps6586x-regulator.c: In function 'tps6586x_parse_regulator_dt':
drivers/regulator/tps6586x-regulator.c:430:8: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
   id = (int)tps6586x_matches[i].driver_data;
        ^

Instead of casting to int, uintptr_t is better suited for receiving and
comparing integers extracted from void *.  This is especially true on
64-bit systems where sizeof(void *) != sizeof(int).

Signed-off-by: Daniel Kurtz <djkurtz@chromium.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/regulator/tps6586x-regulator.c

index 2852de0..9e9d220 100644 (file)
@@ -422,12 +422,12 @@ static struct tps6586x_platform_data *tps6586x_parse_regulator_dt(
                return NULL;
 
        for (i = 0; i < num; i++) {
-               int id;
+               uintptr_t id;
                if (!tps6586x_matches[i].init_data)
                        continue;
 
                pdata->reg_init_data[i] = tps6586x_matches[i].init_data;
-               id = (int)tps6586x_matches[i].driver_data;
+               id = (uintptr_t)tps6586x_matches[i].driver_data;
                if (id == TPS6586X_ID_SYS)
                        sys_rail = pdata->reg_init_data[i]->constraints.name;