diff options
author | Lee Jones <lee.jones@linaro.org> | 2014-02-03 08:24:20 +0000 |
---|---|---|
committer | Lee Jones <lee.jones@linaro.org> | 2014-02-19 13:30:30 +0000 |
commit | 5c6fbd56d16f38fddec629e1dccdeee5ad7f5a42 (patch) | |
tree | d496431bf5f56087ada87ead69f4909cb3dc2c15 /include/linux/mfd | |
parent | 7f8279ce04589a2e0f29b865c3af40609b0ea08d (diff) | |
download | linux-stable-5c6fbd56d16f38fddec629e1dccdeee5ad7f5a42.tar.gz linux-stable-5c6fbd56d16f38fddec629e1dccdeee5ad7f5a42.tar.bz2 linux-stable-5c6fbd56d16f38fddec629e1dccdeee5ad7f5a42.zip |
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: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'include/linux/mfd')
-rw-r--r-- | include/linux/mfd/tps65217.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/mfd/tps65217.h b/include/linux/mfd/tps65217.h index a5a7f0130e96..54b5458ec084 100644 --- a/include/linux/mfd/tps65217.h +++ b/include/linux/mfd/tps65217.h @@ -252,7 +252,7 @@ struct tps65217_board { struct tps65217 { struct device *dev; struct tps65217_board *pdata; - unsigned int id; + unsigned long id; struct regulator_desc desc[TPS65217_NUM_REGULATOR]; struct regulator_dev *rdev[TPS65217_NUM_REGULATOR]; struct regmap *regmap; @@ -263,7 +263,7 @@ static inline struct tps65217 *dev_to_tps65217(struct device *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; } |