Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-22 12:11:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

mfd: max77686: Ensure device type IDs are architecture agnostic

Browse Source 
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>
This commit is contained in:
Lee Jones 2014-07-24 17:07:16 +01:00
parent a259f3896a
commit ec8bd56699
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/mfd/max77686.c
View File

@ -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;

2
include/linux/mfd/max77686-private.h
View File

@ -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 */