Commit 5c6fbd56 authored by Lee Jones's avatar Lee Jones

mfd: tps65217: Naturalise cross-architecture discrepancies

If we compile the TPS65217 for a 64bit architecture we receive the following
warnings:

drivers/mfd/tps65217.c: In function ‘tps65217_probe’:
drivers/mfd/tps65217.c:173:13:
  warning: cast from pointer to integer of different size
   chip_id = (unsigned int)match->data;
             ^
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent 7f8279ce
...@@ -158,7 +158,7 @@ static int tps65217_probe(struct i2c_client *client, ...@@ -158,7 +158,7 @@ static int tps65217_probe(struct i2c_client *client,
{ {
struct tps65217 *tps; struct tps65217 *tps;
unsigned int version; unsigned int version;
unsigned int chip_id = ids->driver_data; unsigned long chip_id = ids->driver_data;
const struct of_device_id *match; const struct of_device_id *match;
bool status_off = false; bool status_off = false;
int ret; int ret;
...@@ -170,7 +170,7 @@ static int tps65217_probe(struct i2c_client *client, ...@@ -170,7 +170,7 @@ static int tps65217_probe(struct i2c_client *client,
"Failed to find matching dt id\n"); "Failed to find matching dt id\n");
return -EINVAL; return -EINVAL;
} }
chip_id = (unsigned int)(unsigned long)match->data; chip_id = (unsigned long)match->data;
status_off = of_property_read_bool(client->dev.of_node, status_off = of_property_read_bool(client->dev.of_node,
"ti,pmic-shutdown-controller"); "ti,pmic-shutdown-controller");
} }
......
...@@ -252,7 +252,7 @@ struct tps65217_board { ...@@ -252,7 +252,7 @@ struct tps65217_board {
struct tps65217 { struct tps65217 {
struct device *dev; struct device *dev;
struct tps65217_board *pdata; struct tps65217_board *pdata;
unsigned int id; unsigned long id;
struct regulator_desc desc[TPS65217_NUM_REGULATOR]; struct regulator_desc desc[TPS65217_NUM_REGULATOR];
struct regulator_dev *rdev[TPS65217_NUM_REGULATOR]; struct regulator_dev *rdev[TPS65217_NUM_REGULATOR];
struct regmap *regmap; struct regmap *regmap;
...@@ -263,7 +263,7 @@ static inline struct tps65217 *dev_to_tps65217(struct device *dev) ...@@ -263,7 +263,7 @@ static inline struct tps65217 *dev_to_tps65217(struct device *dev)
return dev_get_drvdata(dev); return dev_get_drvdata(dev);
} }
static inline int tps65217_chip_id(struct tps65217 *tps65217) static inline unsigned long tps65217_chip_id(struct tps65217 *tps65217)
{ {
return tps65217->id; return tps65217->id;
} }
......
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