mfd: max8997: Naturalise cross-architecture discrepancies
If we compile the MAX8997 for a 64bit architecture we receive the following warnings: drivers/mfd/max8997.c: In function ‘max8997_i2c_get_driver_data’: drivers/mfd/max8997.c:173:10: warning: cast from pointer to integer of different size return (int)match->data; ^ Signed-off-by: Lee Jones <lee.jones@linaro.org>
This commit is contained in:
parent
38dbfb59d1
commit
05fb7a56ad
|
@ -164,15 +164,15 @@ static struct max8997_platform_data *max8997_i2c_parse_dt_pdata(
|
||||||
return pd;
|
return pd;
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline int max8997_i2c_get_driver_data(struct i2c_client *i2c,
|
static inline unsigned long max8997_i2c_get_driver_data(struct i2c_client *i2c,
|
||||||
const struct i2c_device_id *id)
|
const struct i2c_device_id *id)
|
||||||
{
|
{
|
||||||
if (IS_ENABLED(CONFIG_OF) && i2c->dev.of_node) {
|
if (IS_ENABLED(CONFIG_OF) && i2c->dev.of_node) {
|
||||||
const struct of_device_id *match;
|
const struct of_device_id *match;
|
||||||
match = of_match_node(max8997_pmic_dt_match, i2c->dev.of_node);
|
match = of_match_node(max8997_pmic_dt_match, i2c->dev.of_node);
|
||||||
return (int)match->data;
|
return (unsigned long)match->data;
|
||||||
}
|
}
|
||||||
return (int)id->driver_data;
|
return id->driver_data;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int max8997_i2c_probe(struct i2c_client *i2c,
|
static int max8997_i2c_probe(struct i2c_client *i2c,
|
||||||
|
|
|
@ -387,7 +387,7 @@ struct max8997_dev {
|
||||||
struct i2c_client *muic; /* slave addr 0x4a */
|
struct i2c_client *muic; /* slave addr 0x4a */
|
||||||
struct mutex iolock;
|
struct mutex iolock;
|
||||||
|
|
||||||
int type;
|
unsigned long type;
|
||||||
struct platform_device *battery; /* battery control (not fuel gauge) */
|
struct platform_device *battery; /* battery control (not fuel gauge) */
|
||||||
|
|
||||||
int irq;
|
int irq;
|
||||||
|
|
Loading…
Reference in New Issue