commit c245c087c50eabe284b22f7d5a8abc12427d29a7
author Axel Lin <axel.lin@gmail.com> Tue Apr 17 23:48:27 2012 +0800
committer Mark Brown <broonie@opensource.wolfsonmicro.com> Mon Apr 23 13:20:24 2012 +0100
tree 1572f5b272cec44a50268cdd35d140206d52bdf7
parent 94e85a3c5d702a4ce96b7a9b883c949a08ebd93c

regulator: max8997: Remove is_enabled callback implementation for max8997_charger_fixedstate_ops

If is_enabled callback is not implemented, the core assumes that the regulator
is on.

This is simpler than having a hack to retrun 1 in max8997_reg_is_enabled() if
max8997_get_enable_register() returns -EINVAL.

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

drivers/regulator/max8997.c

diff --git a/drivers/regulator/max8997.c b/drivers/regulator/max8997.c
index ec99bd3..d106b74 100644
--- a/drivers/regulator/max8997.c
+++ b/drivers/regulator/max8997.c
@@ -278,9 +278,7 @@
 	u8 val;
 
 	ret = max8997_get_enable_register(rdev, &reg, &mask, &pattern);
-	if (ret == -EINVAL)
-		return 1; /* "not controllable" */
-	else if (ret)
+	if (ret)
 		return ret;
 
 	ret = max8997_read_reg(i2c, reg, &val);
@@ -887,7 +885,6 @@
 };
 
 static struct regulator_ops max8997_charger_fixedstate_ops = {
-	.is_enabled		= max8997_reg_is_enabled,
 	.get_current_limit	= max8997_get_current_limit,
 	.set_current_limit	= max8997_set_current_limit,
 };