Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ec8bd566 authored by Lee Jones's avatar Lee Jones
Browse files

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: default avatarLee Jones <lee.jones@linaro.org>
parent a259f389

drivers/mfd/max77686.c

+2 −3
Original line number Diff line number Diff line
@@ -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;

include/linux/mfd/max77686-private.h

+1 −1
Original line number Diff line number Diff line
@@ -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 */