aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLee Jones <lee.jones@linaro.org>2014-07-24 12:07:16 -0400
committerLee Jones <lee.jones@linaro.org>2014-07-25 10:31:48 -0400
commitec8bd56699cb4371994437583a285b855b6f5e3a (patch)
tree048f2fee779efb43998f56a058cfd3cca412c372
parenta259f3896a39ec7cbcd5f630a6ec95bdcbc080d2 (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.c5
-rw-r--r--include/linux/mfd/max77686-private.h2
2 files changed, 3 insertions, 4 deletions
diff --git a/drivers/mfd/max77686.c b/drivers/mfd/max77686.c
index c65332291bb4..86e552348db4 100644
--- a/drivers/mfd/max77686.c
+++ b/drivers/mfd/max77686.c
@@ -251,10 +251,9 @@ static int max77686_i2c_probe(struct i2c_client *i2c,
251 if (!match) 251 if (!match)
252 return -EINVAL; 252 return -EINVAL;
253 253
254 max77686->type = (int)match->data; 254 max77686->type = (unsigned long)match->data;
255 } else { 255 } else
256 max77686->type = id->driver_data; 256 max77686->type = id->driver_data;
257 }
258 257
259 i2c_set_clientdata(i2c, max77686); 258 i2c_set_clientdata(i2c, max77686);
260 max77686->dev = &i2c->dev; 259 max77686->dev = &i2c->dev;
diff --git a/include/linux/mfd/max77686-private.h b/include/linux/mfd/max77686-private.h
index 0d60b38e5b5c..960b92ad450d 100644
--- a/include/linux/mfd/max77686-private.h
+++ b/include/linux/mfd/max77686-private.h
@@ -439,7 +439,7 @@ struct max77686_dev {
439 struct i2c_client *i2c; /* 0xcc / PMIC, Battery Control, and FLASH */ 439 struct i2c_client *i2c; /* 0xcc / PMIC, Battery Control, and FLASH */
440 struct i2c_client *rtc; /* slave addr 0x0c */ 440 struct i2c_client *rtc; /* slave addr 0x0c */
441 441
442 int type; 442 unsigned long type;
443 443
444 struct regmap *regmap; /* regmap for mfd */ 444 struct regmap *regmap; /* regmap for mfd */
445 struct regmap *rtc_regmap; /* regmap for rtc */ 445 struct regmap *rtc_regmap; /* regmap for rtc */