diff options
| author | Mike Turquette <mturquette@linaro.org> | 2014-02-24 23:07:53 -0800 |
|---|---|---|
| committer | Mike Turquette <mturquette@linaro.org> | 2014-02-24 23:07:53 -0800 |
| commit | ad077ceb8a90c7ef1fc15758ed3811448181ee80 (patch) | |
| tree | dc090e24bb82c41c3785e539b9e60df6c48abfaf /drivers/mfd/max8998.c | |
| parent | c05ab9a0cc8e2b958bb2db2f8f1d200e568a75d4 (diff) | |
| parent | 10b7cdc0084c27a312e59e80420c6aac70c64753 (diff) | |
| download | talos-op-linux-ad077ceb8a90c7ef1fc15758ed3811448181ee80.tar.gz talos-op-linux-ad077ceb8a90c7ef1fc15758ed3811448181ee80.zip | |
Merge branch 'clk-fixes' into clk-next
Diffstat (limited to 'drivers/mfd/max8998.c')
| -rw-r--r-- | drivers/mfd/max8998.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mfd/max8998.c b/drivers/mfd/max8998.c index 612ca404e150..5d5e186b5d8b 100644 --- a/drivers/mfd/max8998.c +++ b/drivers/mfd/max8998.c @@ -169,16 +169,16 @@ static struct max8998_platform_data *max8998_i2c_parse_dt_pdata( return pd; } -static inline int max8998_i2c_get_driver_data(struct i2c_client *i2c, +static inline unsigned long max8998_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(max8998_dt_match, i2c->dev.of_node); - return (int)(long)match->data; + return (unsigned long)match->data; } - return (int)id->driver_data; + return id->driver_data; } static int max8998_i2c_probe(struct i2c_client *i2c, |
