hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Daniel Mack 2013-08-08 12:02:18 +02:00 committed by Mark Brown
parent abe4c51afd
commit d6c7e11395
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/regulator/max8660.c
View File

@ -364,7 +364,7 @@ static int max8660_pdata_from_dt(struct device *dev,
#else #else
static inline int max8660_pdata_from_dt(struct device *dev, static inline int max8660_pdata_from_dt(struct device *dev,
struct device_node **of_node, struct device_node **of_node,
struct max8660_platform_data **pdata) struct max8660_platform_data *pdata)
{ {
return 0; return 0;
} }
@ -380,7 +380,7 @@ static int max8660_probe(struct i2c_client *client,
struct max8660 *max8660; struct max8660 *max8660;
int boot_on, i, id, ret = -EINVAL; int boot_on, i, id, ret = -EINVAL;
struct device_node *of_node[MAX8660_V_END]; struct device_node *of_node[MAX8660_V_END];
unsigned int type; unsigned long type;
if (dev->of_node && !pdata) { if (dev->of_node && !pdata) {
const struct of_device_id *id; const struct of_device_id *id;
@ -395,7 +395,7 @@ static int max8660_probe(struct i2c_client *client,
return ret; return ret;
pdata = &pdata_of; pdata = &pdata_of;
type = (unsigned int) id->data; type = (unsigned long) id->data;
} else { } else {
type = i2c_id->driver_data; type = i2c_id->driver_data;
memset(of_node, 0, sizeof(of_node)); memset(of_node, 0, sizeof(of_node));