summaryrefslogtreecommitdiffstats
path: root/drivers/mfd/arizona-core.c
diff options
context:
space:
mode:
authorLee Jones2014-07-02 15:28:46 +0200
committerLee Jones2014-07-09 17:38:01 +0200
commit942786e6e647cef94cf96dcd836d343be55fc452 (patch)
treec3fd1872c504dfd7181d753d102dbac9c6ddcbe1 /drivers/mfd/arizona-core.c
parentmfd: stmpe: Rid data size incompatibility warn when building for 64bit (diff)
downloadkernel-qcow2-linux-942786e6e647cef94cf96dcd836d343be55fc452.tar.gz
kernel-qcow2-linux-942786e6e647cef94cf96dcd836d343be55fc452.tar.xz
kernel-qcow2-linux-942786e6e647cef94cf96dcd836d343be55fc452.zip
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>
Diffstat (limited to 'drivers/mfd/arizona-core.c')
-rw-r--r--drivers/mfd/arizona-core.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c
index b4f22e7b87f2..e9c3563766a6 100644
--- a/drivers/mfd/arizona-core.c
+++ b/drivers/mfd/arizona-core.c
@@ -497,12 +497,12 @@ const struct dev_pm_ops arizona_pm_ops = {
EXPORT_SYMBOL_GPL(arizona_pm_ops);
#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);
if (id)
- return (int)id->data;
+ return (unsigned long)id->data;
else
return 0;
}