wm8994_ldo1_ops and wm8994_ldo2_ops are the same after converting
wm8994_ldo2_ops to use regulator_list_voltage_linear, merge them.
Signed-off-by: Axel Lin <axel....@ingics.com>
---
drivers/regulator/wm8994-regulator.c | 13 +++----------
1 file changed, 3 insertions(+), 10 deletions(-)
diff --git a/drivers/regulator/wm8994-regulator.c
b/drivers/regulator/wm8994-regulator.c
index fef2692..98edfe0 100644
--- a/drivers/regulator/wm8994-regulator.c
+++ b/drivers/regulator/wm8994-regulator.c
@@ -32,14 +32,7 @@ struct wm8994_ldo {
#define WM8994_LDO1_MAX_SELECTOR 0x7
#define WM8994_LDO2_MAX_SELECTOR 0x3
-static struct regulator_ops wm8994_ldo1_ops = {
- .list_voltage = regulator_list_voltage_linear,
- .map_voltage = regulator_map_voltage_linear,
- .get_voltage_sel = regulator_get_voltage_sel_regmap,
- .set_voltage_sel = regulator_set_voltage_sel_regmap,
-};
-
-static struct regulator_ops wm8994_ldo2_ops = {
+static struct regulator_ops wm8994_ldo_ops = {
.list_voltage = regulator_list_voltage_linear,
.map_voltage = regulator_map_voltage_linear,
.get_voltage_sel = regulator_get_voltage_sel_regmap,
@@ -54,7 +47,7 @@ static struct regulator_desc wm8994_ldo_desc[] = {
.n_voltages = WM8994_LDO1_MAX_SELECTOR + 1,
.vsel_reg = WM8994_LDO_1,
.vsel_mask = WM8994_LDO1_VSEL_MASK,
- .ops = &wm8994_ldo1_ops,
+ .ops = &wm8994_ldo_ops,
.min_uV = 2400000,
.uV_step = 100000,
.enable_time = 3000,
@@ -67,7 +60,7 @@ static struct regulator_desc wm8994_ldo_desc[] = {
.n_voltages = WM8994_LDO2_MAX_SELECTOR + 1,
.vsel_reg = WM8994_LDO_2,
.vsel_mask = WM8994_LDO2_VSEL_MASK,
- .ops = &wm8994_ldo2_ops,
+ .ops = &wm8994_ldo_ops,
.enable_time = 3000,
.owner = THIS_MODULE,
},
--
1.7.9.5
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
