aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLee Jones <lee.jones@linaro.org>2014-07-02 09:34:13 -0400
committerLee Jones <lee.jones@linaro.org>2014-07-09 11:38:01 -0400
commit01a0f4aaaefff9f57bb17e6cc514c84ba43a7335 (patch)
tree0aec539cb3feab6e15d6a967dbae1ccf030900db /drivers
parent942786e6e647cef94cf96dcd836d343be55fc452 (diff)
mfd: tps65910: Rid data size incompatibility warn when building for 64bit
Extinguishes: ../drivers/mfd/tps65910.c: In function ‘tps65910_parse_dt’: ../drivers/mfd/tps65910.c:404:14: warning: cast from pointer to integer of different size Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mfd/tps65910.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/mfd/tps65910.c b/drivers/mfd/tps65910.c
index f9e42ea1cb1a..f243e75d28f3 100644
--- a/drivers/mfd/tps65910.c
+++ b/drivers/mfd/tps65910.c
@@ -387,7 +387,7 @@ static const struct of_device_id tps65910_of_match[] = {
387MODULE_DEVICE_TABLE(of, tps65910_of_match); 387MODULE_DEVICE_TABLE(of, tps65910_of_match);
388 388
389static struct tps65910_board *tps65910_parse_dt(struct i2c_client *client, 389static struct tps65910_board *tps65910_parse_dt(struct i2c_client *client,
390 int *chip_id) 390 unsigned long *chip_id)
391{ 391{
392 struct device_node *np = client->dev.of_node; 392 struct device_node *np = client->dev.of_node;
393 struct tps65910_board *board_info; 393 struct tps65910_board *board_info;
@@ -401,7 +401,7 @@ static struct tps65910_board *tps65910_parse_dt(struct i2c_client *client,
401 return NULL; 401 return NULL;
402 } 402 }
403 403
404 *chip_id = (int)match->data; 404 *chip_id = (unsigned long)match->data;
405 405
406 board_info = devm_kzalloc(&client->dev, sizeof(*board_info), 406 board_info = devm_kzalloc(&client->dev, sizeof(*board_info),
407 GFP_KERNEL); 407 GFP_KERNEL);
@@ -431,7 +431,7 @@ static struct tps65910_board *tps65910_parse_dt(struct i2c_client *client,
431#else 431#else
432static inline 432static inline
433struct tps65910_board *tps65910_parse_dt(struct i2c_client *client, 433struct tps65910_board *tps65910_parse_dt(struct i2c_client *client,
434 int *chip_id) 434 unsigned long *chip_id)
435{ 435{
436 return NULL; 436 return NULL;
437} 437}
@@ -453,14 +453,14 @@ static void tps65910_power_off(void)
453} 453}
454 454
455static int tps65910_i2c_probe(struct i2c_client *i2c, 455static int tps65910_i2c_probe(struct i2c_client *i2c,
456 const struct i2c_device_id *id) 456 const struct i2c_device_id *id)
457{ 457{
458 struct tps65910 *tps65910; 458 struct tps65910 *tps65910;
459 struct tps65910_board *pmic_plat_data; 459 struct tps65910_board *pmic_plat_data;
460 struct tps65910_board *of_pmic_plat_data = NULL; 460 struct tps65910_board *of_pmic_plat_data = NULL;
461 struct tps65910_platform_data *init_data; 461 struct tps65910_platform_data *init_data;
462 unsigned long chip_id = id->driver_data;
462 int ret = 0; 463 int ret = 0;
463 int chip_id = id->driver_data;
464 464
465 pmic_plat_data = dev_get_platdata(&i2c->dev); 465 pmic_plat_data = dev_get_platdata(&i2c->dev);
466 466