Commit 01a0f4aa authored by Lee Jones's avatar Lee Jones

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: default avatarLee Jones <lee.jones@linaro.org>
parent 942786e6
...@@ -387,7 +387,7 @@ static const struct of_device_id tps65910_of_match[] = { ...@@ -387,7 +387,7 @@ static const struct of_device_id tps65910_of_match[] = {
MODULE_DEVICE_TABLE(of, tps65910_of_match); MODULE_DEVICE_TABLE(of, tps65910_of_match);
static struct tps65910_board *tps65910_parse_dt(struct i2c_client *client, 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 device_node *np = client->dev.of_node;
struct tps65910_board *board_info; struct tps65910_board *board_info;
...@@ -401,7 +401,7 @@ static struct tps65910_board *tps65910_parse_dt(struct i2c_client *client, ...@@ -401,7 +401,7 @@ static struct tps65910_board *tps65910_parse_dt(struct i2c_client *client,
return NULL; return NULL;
} }
*chip_id = (int)match->data; *chip_id = (unsigned long)match->data;
board_info = devm_kzalloc(&client->dev, sizeof(*board_info), board_info = devm_kzalloc(&client->dev, sizeof(*board_info),
GFP_KERNEL); GFP_KERNEL);
...@@ -431,7 +431,7 @@ static struct tps65910_board *tps65910_parse_dt(struct i2c_client *client, ...@@ -431,7 +431,7 @@ static struct tps65910_board *tps65910_parse_dt(struct i2c_client *client,
#else #else
static inline static inline
struct tps65910_board *tps65910_parse_dt(struct i2c_client *client, struct tps65910_board *tps65910_parse_dt(struct i2c_client *client,
int *chip_id) unsigned long *chip_id)
{ {
return NULL; return NULL;
} }
...@@ -453,14 +453,14 @@ static void tps65910_power_off(void) ...@@ -453,14 +453,14 @@ static void tps65910_power_off(void)
} }
static int tps65910_i2c_probe(struct i2c_client *i2c, 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 *tps65910;
struct tps65910_board *pmic_plat_data; struct tps65910_board *pmic_plat_data;
struct tps65910_board *of_pmic_plat_data = NULL; struct tps65910_board *of_pmic_plat_data = NULL;
struct tps65910_platform_data *init_data; struct tps65910_platform_data *init_data;
unsigned long chip_id = id->driver_data;
int ret = 0; int ret = 0;
int chip_id = id->driver_data;
pmic_plat_data = dev_get_platdata(&i2c->dev); pmic_plat_data = dev_get_platdata(&i2c->dev);
......
...@@ -892,7 +892,7 @@ struct tps65910 { ...@@ -892,7 +892,7 @@ struct tps65910 {
struct device *dev; struct device *dev;
struct i2c_client *i2c_client; struct i2c_client *i2c_client;
struct regmap *regmap; struct regmap *regmap;
unsigned int id; unsigned long id;
/* Client devices */ /* Client devices */
struct tps65910_pmic *pmic; struct tps65910_pmic *pmic;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment