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>

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
1 parent 942786e6e6
Showing 2 changed files with 6 additions and 6 deletions Side-by-side Diff
drivers/mfd/tps65910.c
include/linux/mfd/tps65910.h
@@ -387,7 +387,7 @@
 MODULE_DEVICE_TABLE(of, tps65910_of_match);
  
 static struct tps65910_board *tps65910_parse_dt(struct i2c_client *client,
-						int *chip_id)
+						unsigned long *chip_id)
 {
 	struct device_node *np = client->dev.of_node;
 	struct tps65910_board *board_info;
@@ -401,7 +401,7 @@
 		return NULL;
 	}
  
-	*chip_id  = (int)match->data;
+	*chip_id  = (unsigned long)match->data;
  
 	board_info = devm_kzalloc(&client->dev, sizeof(*board_info),
 			GFP_KERNEL);
@@ -431,7 +431,7 @@
 #else
 static inline
 struct tps65910_board *tps65910_parse_dt(struct i2c_client *client,
-					 int *chip_id)
+					 unsigned long *chip_id)
 {
 	return NULL;
 }
  
  
@@ -453,14 +453,14 @@
 }
  
 static int tps65910_i2c_probe(struct i2c_client *i2c,
-					const struct i2c_device_id *id)
+			      const struct i2c_device_id *id)
 {
 	struct tps65910 *tps65910;
 	struct tps65910_board *pmic_plat_data;
 	struct tps65910_board *of_pmic_plat_data = NULL;
 	struct tps65910_platform_data *init_data;
+	unsigned long chip_id = id->driver_data;
 	int ret = 0;
-	int chip_id = id->driver_data;
  
 	pmic_plat_data = dev_get_platdata(&i2c->dev);
  
@@ -892,7 +892,7 @@
 	struct device *dev;
 	struct i2c_client *i2c_client;
 	struct regmap *regmap;
-	unsigned int id;
+	unsigned long id;
  
 	/* Client devices */
 	struct tps65910_pmic *pmic;
...	...	@@ -387,7 +387,7 @@
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,7 +401,7 @@
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,7 +431,7 @@
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	}
438	438
439	439
...	...	@@ -453,14 +453,14 @@
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
...	...	@@ -892,7 +892,7 @@
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;