Skip to contentSkip to conversation

regulators: max8660: fix build warnings

PATCH Applied Daniel Mack 2 participants 2 messages Aug 8, 2013 Voltage and current regulator framework

lore
Share & tools
lore

Daniel Mack

author
#0 lore raw

PATCH 1/1 regulators: 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 <[email protected]>
Reported-by Fengguang Wu <[email protected]>
---
 drivers/regulator/max8660.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/regulator/max8660.c +3 -3
index 7e6177e..aa8d823 100644
@@ -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));
Signature · 1 line
1.8.3.1
maintainer Applied
#1 lore raw
Quoted 2 lines · Daniel Mack

Fix a build warning for !CONFIG_OF and a cast from void* to unsigned int which is invalid on 64bit machines.

Applied, thanks.