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

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
...@@ -497,12 +497,12 @@ const struct dev_pm_ops arizona_pm_ops = { ...@@ -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;
} }
......
...@@ -24,11 +24,12 @@ ...@@ -24,11 +24,12 @@
#include "arizona.h" #include "arizona.h"
static int arizona_i2c_probe(struct i2c_client *i2c, static int arizona_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id) const struct i2c_device_id *id)
{ {
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);
......
...@@ -28,7 +28,8 @@ static int arizona_spi_probe(struct spi_device *spi) ...@@ -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);
......
...@@ -46,9 +46,9 @@ int arizona_irq_init(struct arizona *arizona); ...@@ -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;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment