[PATCH] MAX8997/8966 PMIC: compiler warning removed (incompatiblepointer)

From: MyungJoo Ham
Date: Fri Mar 04 2011 - 02:24:24 EST


Signed-off-by: MyungJoo Ham <myungjoo.ham@xxxxxxxxxxx>
Signed-off-by: Kyungmin Park <kyungmin.park@xxxxxxxxxxx>
---
drivers/regulator/max8997.c | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/drivers/regulator/max8997.c b/drivers/regulator/max8997.c
index 30778c5..957063a 100644
--- a/drivers/regulator/max8997.c
+++ b/drivers/regulator/max8997.c
@@ -790,18 +790,27 @@ static struct regulator_ops max8997_fixedstate_ops = {
.set_voltage = max8997_set_voltage_charger_cv,
};

+static int max8997_set_voltage_ldo_wrap(struct regulator_dev *rdev,
+ int min_uV, int max_uV)
+{
+ unsigned dummy;
+
+ return max8997_set_voltage_ldo(rdev, min_uV, max_uV, &dummy);
+}
+
+
static struct regulator_ops max8997_charger_ops = {
.is_enabled = max8997_reg_is_enabled,
.enable = max8997_reg_enable,
.disable = max8997_reg_disable,
.get_current_limit = max8997_get_voltage,
- .set_current_limit = max8997_set_voltage_ldo,
+ .set_current_limit = max8997_set_voltage_ldo_wrap,
};

static struct regulator_ops max8997_charger_fixedstate_ops = {
.is_enabled = max8997_reg_is_enabled,
.get_current_limit = max8997_get_voltage,
- .set_current_limit = max8997_set_voltage_ldo,
+ .set_current_limit = max8997_set_voltage_ldo_wrap,
};

#define regulator_desc_ldo(num) { \
--
1.7.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/