X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=drivers%2Fmfd%2Fmax8998.c;h=5d5e186b5d8bbbfed035725480fb85dc52a0fdb4;hb=adf961d7e8006d2cb16ceee07582b145b9ef69f7;hp=612ca404e1502d6c736eaf239d9b721e522664f9;hpb=9b244b5dc720f2b2135b2e64d44ab10220c2bf21;p=~andy%2Flinux diff --git a/drivers/mfd/max8998.c b/drivers/mfd/max8998.c index 612ca404e15..5d5e186b5d8 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,