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

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

mfd: stmpe: Rid data size incompatibility warn when building for 64bit 



Extinguishes:

../drivers/mfd/stmpe-i2c.c: In function ‘stmpe_i2c_probe’:
../drivers/mfd/stmpe-i2c.c:88:13:
	warning: cast from pointer to integer of different size
	partnum = (int)of_id->data;

Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent 52764fd9

drivers/mfd/stmpe-i2c.c

+2 −2
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ MODULE_DEVICE_TABLE(of, stmpe_of_match); 
static int

stmpe_i2c_probe(struct i2c_client *i2c, const struct i2c_device_id *id)

{

	int partnum;

	enum stmpe_partnum partnum;

	const struct of_device_id *of_id;



	i2c_ci.data = (void *)id;
@@ -85,7 +85,7 @@ stmpe_i2c_probe(struct i2c_client *i2c, const struct i2c_device_id *id) 
		dev_info(&i2c->dev, "matching on node name, compatible is preferred\n");

		partnum = id->driver_data;

	} else

		partnum = (int)of_id->data;

		partnum = (enum stmpe_partnum)of_id->data;



	return stmpe_probe(&i2c_ci, partnum);

}

drivers/mfd/stmpe.c

+1 −1
Original line number Diff line number Diff line
@@ -1147,7 +1147,7 @@ static void stmpe_of_probe(struct stmpe_platform_data *pdata, 
}



/* Called from client specific probe routines */

int stmpe_probe(struct stmpe_client_info *ci, int partnum)

int stmpe_probe(struct stmpe_client_info *ci, enum stmpe_partnum partnum)

{

	struct stmpe_platform_data *pdata = dev_get_platdata(ci->dev);

	struct device_node *np = ci->dev->of_node;

drivers/mfd/stmpe.h

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ struct stmpe_client_info { 
	void (*init)(struct stmpe *stmpe);

};



int stmpe_probe(struct stmpe_client_info *ci, int partnum);

int stmpe_probe(struct stmpe_client_info *ci, enum stmpe_partnum partnum);

int stmpe_remove(struct stmpe *stmpe);



#define STMPE_ICR_LSB_HIGH	(1 << 2)