regulator: tps6586x: silence pointer-to-int-cast

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>
This commit is contained in:
Daniel Kurtz 2015-07-22 18:23:26 +08:00 committed by Mark Brown
parent bc0195aad0
commit a70f0d027c
1 changed files with 2 additions and 2 deletions

View File

@ -422,12 +422,12 @@ static struct tps6586x_platform_data *tps6586x_parse_regulator_dt(
return NULL; return NULL;
for (i = 0; i < num; i++) { for (i = 0; i < num; i++) {
int id; uintptr_t id;
if (!tps6586x_matches[i].init_data) if (!tps6586x_matches[i].init_data)
continue; continue;
pdata->reg_init_data[i] = tps6586x_matches[i].init_data; 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) if (id == TPS6586X_ID_SYS)
sys_rail = pdata->reg_init_data[i]->constraints.name; sys_rail = pdata->reg_init_data[i]->constraints.name;