summaryrefslogtreecommitdiffstats
path: root/drivers/mfd/sec-core.c
diff options
context:
space:
mode:
authorPankaj Dubey <pankaj.dubey@samsung.com>2014-03-13 03:14:07 +0100
committerLee Jones <lee.jones@linaro.org>2014-03-18 11:50:20 +0100
commit8f695de515b9e08e30c5b7fae48c0672c8361c51 (patch)
treef1e05c54a02d0bafc210879108a49ce77b72115b /drivers/mfd/sec-core.c
parentmfd: sec-core: Fix possible NULL pointer dereference when i2c_new_dummy error (diff)
downloadlinux-8f695de515b9e08e30c5b7fae48c0672c8361c51.tar.xz
linux-8f695de515b9e08e30c5b7fae48c0672c8361c51.zip
mfd: sec-core: Silence compiler warning
When used 64bit compiler GCC warns as drivers/mfd/sec-core.c:199:10: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] Signed-off-by: Pankaj Dubey <pankaj.dubey@samsung.com> Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'drivers/mfd/sec-core.c')
-rw-r--r--drivers/mfd/sec-core.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mfd/sec-core.c b/drivers/mfd/sec-core.c
index d163c66edebb..3fc3ebdd7b8a 100644
--- a/drivers/mfd/sec-core.c
+++ b/drivers/mfd/sec-core.c
@@ -212,17 +212,17 @@ static struct sec_platform_data *sec_pmic_i2c_parse_dt_pdata(
}
#endif
-static inline int sec_i2c_get_driver_data(struct i2c_client *i2c,
+static inline unsigned long sec_i2c_get_driver_data(struct i2c_client *i2c,
const struct i2c_device_id *id)
{
#ifdef CONFIG_OF
if (i2c->dev.of_node) {
const struct of_device_id *match;
match = of_match_node(sec_dt_match, i2c->dev.of_node);
- return (int)match->data;
+ return (unsigned long)match->data;
}
#endif
- return (int)id->driver_data;
+ return id->driver_data;
}
static int sec_pmic_probe(struct i2c_client *i2c,