summaryrefslogtreecommitdiffstats
path: root/drivers/regulator
diff options
context:
space:
mode:
authorDaniel Mack <zonque@gmail.com>2013-08-08 12:02:18 +0200
committerMark Brown <broonie@linaro.org>2013-08-08 11:43:10 +0100
commitd6c7e1139591b9ba7c4ad9c5eec748f0a68ad212 (patch)
treefc725cd3031a71ba29db586e001a34f720efbe8b /drivers/regulator
parentabe4c51afda02423c81da6f1eaaa50b733f1ecc2 (diff)
regulator: max8660: fix build warnings
Fix a build warning for !CONFIG_OF and a cast from void* to unsigned int which is invalid on 64bit machines. Signed-off-by: Daniel Mack <zonque@gmail.com> Reported-by: Fengguang Wu <fengguang.wu@intel.com> Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'drivers/regulator')
-rw-r--r--drivers/regulator/max8660.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/regulator/max8660.c b/drivers/regulator/max8660.c
index a4f2f1a3834..144bcacd734 100644
--- a/drivers/regulator/max8660.c
+++ b/drivers/regulator/max8660.c
@@ -364,7 +364,7 @@ static int max8660_pdata_from_dt(struct device *dev,
#else
static inline int max8660_pdata_from_dt(struct device *dev,
struct device_node **of_node,
- struct max8660_platform_data **pdata)
+ struct max8660_platform_data *pdata)
{
return 0;
}
@@ -380,7 +380,7 @@ static int max8660_probe(struct i2c_client *client,
struct max8660 *max8660;
int boot_on, i, id, ret = -EINVAL;
struct device_node *of_node[MAX8660_V_END];
- unsigned int type;
+ unsigned long type;
if (dev->of_node && !pdata) {
const struct of_device_id *id;
@@ -395,7 +395,7 @@ static int max8660_probe(struct i2c_client *client,
return ret;
pdata = &pdata_of;
- type = (unsigned int) id->data;
+ type = (unsigned long) id->data;
} else {
type = i2c_id->driver_data;
memset(of_node, 0, sizeof(of_node));