Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/mfd/tps65910.c

+5 −5
Original line number Diff line number Diff line
@@ -387,7 +387,7 @@ static const struct of_device_id tps65910_of_match[] = { 
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 @@ static struct tps65910_board *tps65910_parse_dt(struct i2c_client *client, 
		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 @@ static struct tps65910_board *tps65910_parse_dt(struct i2c_client *client, 
#else

static inline

struct tps65910_board *tps65910_parse_dt(struct i2c_client *client,

					 int *chip_id)

					 unsigned long *chip_id)

{

	return NULL;

}
@@ -459,8 +459,8 @@ static int tps65910_i2c_probe(struct i2c_client *i2c, 
	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);

include/linux/mfd/tps65910.h

+1 −1
Original line number Diff line number Diff line
@@ -892,7 +892,7 @@ struct tps65910 { 
	struct device *dev;

	struct i2c_client *i2c_client;

	struct regmap *regmap;

	unsigned int id;

	unsigned long id;



	/* Client devices */

	struct tps65910_pmic *pmic;