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

Commit 05fb7a56 authored by Lee Jones's avatar Lee Jones
Browse files

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

drivers/mfd/max8997.c

+3 −3
Original line number Diff line number Diff line
@@ -164,15 +164,15 @@ static struct max8997_platform_data *max8997_i2c_parse_dt_pdata( 
	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)

{

	if (IS_ENABLED(CONFIG_OF) && i2c->dev.of_node) {

		const struct of_device_id *match;

		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,

include/linux/mfd/max8997-private.h

+1 −1
Original line number Diff line number Diff line
@@ -387,7 +387,7 @@ struct max8997_dev { 
	struct i2c_client *muic; /* slave addr 0x4a */

	struct mutex iolock;



	int type;

	unsigned long type;

	struct platform_device *battery; /* battery control (not fuel gauge) */



	int irq;