diff options
| author | Lee Jones <lee.jones@linaro.org> | 2014-01-23 15:35:28 +0100 |
|---|---|---|
| committer | Lee Jones <lee.jones@linaro.org> | 2014-02-19 14:30:23 +0100 |
| commit | 05fb7a56ad65ceaa1907bb9c66bfa1108847667f (patch) | |
| tree | d0d19b7006cf50a06cefc6b267a29bf405a780e5 /drivers/mfd/max8997.c | |
| parent | Linus 3.14-rc1 (diff) | |
| download | linux-05fb7a56ad65ceaa1907bb9c66bfa1108847667f.tar.xz linux-05fb7a56ad65ceaa1907bb9c66bfa1108847667f.zip | |
mfd: max8997: Naturalise cross-architecture discrepancies
If we compile the MAX8997 for a 64bit architecture we receive the following
warnings:
drivers/mfd/max8997.c: In function ‘max8997_i2c_get_driver_data’:
drivers/mfd/max8997.c:173:10:
warning: cast from pointer to integer of different size
return (int)match->data;
^
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'drivers/mfd/max8997.c')
| -rw-r--r-- | drivers/mfd/max8997.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mfd/max8997.c b/drivers/mfd/max8997.c index be88a3bf7b85..5adede0fb04c 100644 --- a/drivers/mfd/max8997.c +++ b/drivers/mfd/max8997.c @@ -164,15 +164,15 @@ static struct max8997_platform_data *max8997_i2c_parse_dt_pdata( return pd; } -static inline int max8997_i2c_get_driver_data(struct i2c_client *i2c, +static inline unsigned long max8997_i2c_get_driver_data(struct i2c_client *i2c, const struct i2c_device_id *id) { if (IS_ENABLED(CONFIG_OF) && i2c->dev.of_node) { const struct of_device_id *match; match = of_match_node(max8997_pmic_dt_match, i2c->dev.of_node); - return (int)match->data; + return (unsigned long)match->data; } - return (int)id->driver_data; + return id->driver_data; } static int max8997_i2c_probe(struct i2c_client *i2c, |