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

Commit 942786e6 authored by Lee Jones's avatar Lee Jones
Browse files

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



Extinguishes:

../drivers/mfd/arizona-core.c: In function ‘arizona_of_get_type’:
../drivers/mfd/arizona-core.c:505:10:
	warning: cast from pointer to integer of different size

Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent c00572bc

drivers/mfd/arizona-core.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -497,12 +497,12 @@ const struct dev_pm_ops arizona_pm_ops = { 
EXPORT_SYMBOL_GPL(arizona_pm_ops);

EXPORT_SYMBOL_GPL(arizona_pm_ops);





#ifdef CONFIG_OF

#ifdef CONFIG_OF

int arizona_of_get_type(struct device *dev)

unsigned long arizona_of_get_type(struct device *dev)

{

{

	const struct of_device_id *id = of_match_device(arizona_of_match, dev);

	const struct of_device_id *id = of_match_device(arizona_of_match, dev);





	if (id)

	if (id)

		return (int)id->data;

		return (unsigned long)id->data;

	else

	else

		return 0;

		return 0;

}

}

drivers/mfd/arizona-i2c.c

+3 −2
Original line number Original line Diff line number Diff line
@@ -28,7 +28,8 @@ static int arizona_i2c_probe(struct i2c_client *i2c, 
{

{

	struct arizona *arizona;

	struct arizona *arizona;

	const struct regmap_config *regmap_config;

	const struct regmap_config *regmap_config;

	int ret, type;

	unsigned long type;

	int ret;





	if (i2c->dev.of_node)

	if (i2c->dev.of_node)

		type = arizona_of_get_type(&i2c->dev);

		type = arizona_of_get_type(&i2c->dev);

drivers/mfd/arizona-spi.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -28,7 +28,8 @@ static int arizona_spi_probe(struct spi_device *spi) 
	const struct spi_device_id *id = spi_get_device_id(spi);

	const struct spi_device_id *id = spi_get_device_id(spi);

	struct arizona *arizona;

	struct arizona *arizona;

	const struct regmap_config *regmap_config;

	const struct regmap_config *regmap_config;

	int ret, type;

	unsigned long type;

	int ret;





	if (spi->dev.of_node)

	if (spi->dev.of_node)

		type = arizona_of_get_type(&spi->dev);

		type = arizona_of_get_type(&spi->dev);

drivers/mfd/arizona.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -46,9 +46,9 @@ int arizona_irq_init(struct arizona *arizona); 
int arizona_irq_exit(struct arizona *arizona);

int arizona_irq_exit(struct arizona *arizona);





#ifdef CONFIG_OF

#ifdef CONFIG_OF

int arizona_of_get_type(struct device *dev);

unsigned long arizona_of_get_type(struct device *dev);

#else

#else

static inline int arizona_of_get_type(struct device *dev)

static inline unsigned long arizona_of_get_type(struct device *dev)

{

{

	return 0;

	return 0;

}

}