Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

Lee Jones 01a0f4aa 942786e6

+6 -6
+5 -5
drivers/mfd/tps65910.c
··· 387 387 MODULE_DEVICE_TABLE(of, tps65910_of_match); 388 388 389 389 static struct tps65910_board *tps65910_parse_dt(struct i2c_client *client, 390 - int *chip_id) 390 + unsigned long *chip_id) 391 391 { 392 392 struct device_node *np = client->dev.of_node; 393 393 struct tps65910_board *board_info; ··· 401 401 return NULL; 402 402 } 403 403 404 - *chip_id = (int)match->data; 404 + *chip_id = (unsigned long)match->data; 405 405 406 406 board_info = devm_kzalloc(&client->dev, sizeof(*board_info), 407 407 GFP_KERNEL); ··· 431 431 #else 432 432 static inline 433 433 struct tps65910_board *tps65910_parse_dt(struct i2c_client *client, 434 - int *chip_id) 434 + unsigned long *chip_id) 435 435 { 436 436 return NULL; 437 437 } ··· 453 453 } 454 454 455 455 static 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 458 struct tps65910 *tps65910; 459 459 struct tps65910_board *pmic_plat_data; 460 460 struct tps65910_board *of_pmic_plat_data = NULL; 461 461 struct tps65910_platform_data *init_data; 462 + unsigned long chip_id = id->driver_data; 462 463 int ret = 0; 463 - int chip_id = id->driver_data; 464 464 465 465 pmic_plat_data = dev_get_platdata(&i2c->dev); 466 466
+1 -1
include/linux/mfd/tps65910.h
··· 892 892 struct device *dev; 893 893 struct i2c_client *i2c_client; 894 894 struct regmap *regmap; 895 - unsigned int id; 895 + unsigned long id; 896 896 897 897 /* Client devices */ 898 898 struct tps65910_pmic *pmic;