Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Lee Jones <lee.jones@linaro.org>

Lee Jones 942786e6 c00572bc

+9 -7
+2 -2
drivers/mfd/arizona-core.c
··· 497 497 EXPORT_SYMBOL_GPL(arizona_pm_ops); 498 498 499 499 #ifdef CONFIG_OF 500 - int arizona_of_get_type(struct device *dev) 500 + unsigned long arizona_of_get_type(struct device *dev) 501 501 { 502 502 const struct of_device_id *id = of_match_device(arizona_of_match, dev); 503 503 504 504 if (id) 505 - return (int)id->data; 505 + return (unsigned long)id->data; 506 506 else 507 507 return 0; 508 508 }
+3 -2
drivers/mfd/arizona-i2c.c
··· 24 24 #include "arizona.h" 25 25 26 26 static int arizona_i2c_probe(struct i2c_client *i2c, 27 - const struct i2c_device_id *id) 27 + const struct i2c_device_id *id) 28 28 { 29 29 struct arizona *arizona; 30 30 const struct regmap_config *regmap_config; 31 - int ret, type; 31 + unsigned long type; 32 + int ret; 32 33 33 34 if (i2c->dev.of_node) 34 35 type = arizona_of_get_type(&i2c->dev);
+2 -1
drivers/mfd/arizona-spi.c
··· 28 28 const struct spi_device_id *id = spi_get_device_id(spi); 29 29 struct arizona *arizona; 30 30 const struct regmap_config *regmap_config; 31 - int ret, type; 31 + unsigned long type; 32 + int ret; 32 33 33 34 if (spi->dev.of_node) 34 35 type = arizona_of_get_type(&spi->dev);
+2 -2
drivers/mfd/arizona.h
··· 46 46 int arizona_irq_exit(struct arizona *arizona); 47 47 48 48 #ifdef CONFIG_OF 49 - int arizona_of_get_type(struct device *dev); 49 + unsigned long arizona_of_get_type(struct device *dev); 50 50 #else 51 - static inline int arizona_of_get_type(struct device *dev) 51 + static inline unsigned long arizona_of_get_type(struct device *dev) 52 52 { 53 53 return 0; 54 54 }