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 <[email protected]>
Reported-by: Fengguang Wu <[email protected]>
---
drivers/regulator/max8660.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/regulator/max8660.c b/drivers/regulator/max8660.c
index 7e6177e..aa8d823 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));
--
1.8.3.1
On Thu, Aug 08, 2013 at 12:02:18PM +0200, Daniel Mack wrote:
> Fix a build warning for !CONFIG_OF and a cast from void* to
> unsigned int which is invalid on 64bit machines.
Applied, thanks.