diff options
| author | Lee Jones <lee.jones@linaro.org> | 2014-07-24 17:07:16 +0100 |
|---|---|---|
| committer | Lee Jones <lee.jones@linaro.org> | 2014-07-25 15:31:48 +0100 |
| commit | ec8bd56699cb4371994437583a285b855b6f5e3a (patch) | |
| tree | 048f2fee779efb43998f56a058cfd3cca412c372 | |
| parent | a259f3896a39ec7cbcd5f630a6ec95bdcbc080d2 (diff) | |
mfd: max77686: Ensure device type IDs are architecture agnostic
Extinguishes:
../drivers/mfd/max77686.c: In function ‘max77686_i2c_probe’:
../drivers/mfd/max77686.c:254:20:
warning: cast from pointer to integer of different size
Signed-off-by: Lee Jones <lee.jones@linaro.org>
| -rw-r--r-- | drivers/mfd/max77686.c | 5 | ||||
| -rw-r--r-- | include/linux/mfd/max77686-private.h | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/drivers/mfd/max77686.c b/drivers/mfd/max77686.c index c65332291bb..86e552348db 100644 --- a/drivers/mfd/max77686.c +++ b/drivers/mfd/max77686.c @@ -251,10 +251,9 @@ static int max77686_i2c_probe(struct i2c_client *i2c, if (!match) return -EINVAL; - max77686->type = (int)match->data; - } else { + max77686->type = (unsigned long)match->data; + } else max77686->type = id->driver_data; - } i2c_set_clientdata(i2c, max77686); max77686->dev = &i2c->dev; diff --git a/include/linux/mfd/max77686-private.h b/include/linux/mfd/max77686-private.h index 0d60b38e5b5..960b92ad450 100644 --- a/include/linux/mfd/max77686-private.h +++ b/include/linux/mfd/max77686-private.h @@ -439,7 +439,7 @@ struct max77686_dev { struct i2c_client *i2c; /* 0xcc / PMIC, Battery Control, and FLASH */ struct i2c_client *rtc; /* slave addr 0x0c */ - int type; + unsigned long type; struct regmap *regmap; /* regmap for mfd */ struct regmap *rtc_regmap; /* regmap for rtc */ |