aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPankaj Dubey <pankaj.dubey@samsung.com>2014-03-12 22:14:07 -0400
committerLee Jones <lee.jones@linaro.org>2014-03-18 06:50:20 -0400
commit8f695de515b9e08e30c5b7fae48c0672c8361c51 (patch)
treef1e05c54a02d0bafc210879108a49ce77b72115b
parent65aba1e04916d72b30c028730a1e31860c225412 (diff)
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>
-rw-r--r--drivers/mfd/sec-core.c6
-rw-r--r--include/linux/mfd/samsung/core.h2
2 files changed, 4 insertions, 4 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(
212} 212}
213#endif 213#endif
214 214
215static inline int sec_i2c_get_driver_data(struct i2c_client *i2c, 215static inline unsigned long sec_i2c_get_driver_data(struct i2c_client *i2c,
216 const struct i2c_device_id *id) 216 const struct i2c_device_id *id)
217{ 217{
218#ifdef CONFIG_OF 218#ifdef CONFIG_OF
219 if (i2c->dev.of_node) { 219 if (i2c->dev.of_node) {
220 const struct of_device_id *match; 220 const struct of_device_id *match;
221 match = of_match_node(sec_dt_match, i2c->dev.of_node); 221 match = of_match_node(sec_dt_match, i2c->dev.of_node);
222 return (int)match->data; 222 return (unsigned long)match->data;
223 } 223 }
224#endif 224#endif
225 return (int)id->driver_data; 225 return id->driver_data;
226} 226}
227 227
228static int sec_pmic_probe(struct i2c_client *i2c, 228static int sec_pmic_probe(struct i2c_client *i2c,
diff --git a/include/linux/mfd/samsung/core.h b/include/linux/mfd/samsung/core.h
index 8e9bbb1083d4..5073d81660e7 100644
--- a/include/linux/mfd/samsung/core.h
+++ b/include/linux/mfd/samsung/core.h
@@ -51,7 +51,7 @@ struct sec_pmic_dev {
51 struct regmap_irq_chip_data *irq_data; 51 struct regmap_irq_chip_data *irq_data;
52 52
53 int ono; 53 int ono;
54 int type; 54 unsigned long type;
55 bool wakeup; 55 bool wakeup;
56 bool wtsr_smpl; 56 bool wtsr_smpl;
57}; 57};