regulator: wm8400: Get rid of wm8400_block_read/wm8400_set_bits functions

The only user of wm8400_block_read/wm8400_set_bits functions is the
wm8400 regulator driver. At the context of all the callers, we can
use regmap_bulk_read/regmap_update_bits directly.
Thus remove wm8400_block_read/wm8400_set_bits functions.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Acked-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/mfd/wm8400-core.c b/drivers/mfd/wm8400-core.c
index 8a98a2fc74e11fa1204677ffffa9b57ca206b92e..7eab2bedad930823c68e85dfe52939181c90e26a 100644 (file)
--- a/drivers/mfd/wm8400-core.c
+++ b/drivers/mfd/wm8400-core.c
@@ -35,12 +35,6 @@ static bool wm8400_volatile(struct device *dev, unsigned int reg)
        }
 }
 
-int wm8400_block_read(struct wm8400 *wm8400, u8 reg, int count, u16 *data)
-{
-       return regmap_bulk_read(wm8400->regmap, reg, data, count);
-}
-EXPORT_SYMBOL_GPL(wm8400_block_read);
-
 static int wm8400_register_codec(struct wm8400 *wm8400)
 {
        const struct mfd_cell cell = {

diff --git a/drivers/regulator/wm8400-regulator.c b/drivers/regulator/wm8400-regulator.c
index fb1837657b64c11d5babb8d8bc4e432169ea172b..40c4e66284715d2f4982bf06e3064f8b53d5bd40 100644 (file)
--- a/drivers/regulator/wm8400-regulator.c
+++ b/drivers/regulator/wm8400-regulator.c
@@ -36,13 +36,12 @@ static const struct regulator_ops wm8400_ldo_ops = {
 
 static unsigned int wm8400_dcdc_get_mode(struct regulator_dev *dev)
 {
-       struct wm8400 *wm8400 = rdev_get_drvdata(dev);
+       struct regmap *rmap = rdev_get_regmap(dev);
        int offset = (rdev_get_id(dev) - WM8400_DCDC1) * 2;
        u16 data[2];
        int ret;
 
-       ret = wm8400_block_read(wm8400, WM8400_DCDC1_CONTROL_1 + offset, 2,
-                               data);
+       ret = regmap_bulk_read(rmap, WM8400_DCDC1_CONTROL_1 + offset, data, 2);
        if (ret != 0)
                return 0;
 
@@ -63,36 +62,36 @@ static unsigned int wm8400_dcdc_get_mode(struct regulator_dev *dev)
 
 static int wm8400_dcdc_set_mode(struct regulator_dev *dev, unsigned int mode)
 {
-       struct wm8400 *wm8400 = rdev_get_drvdata(dev);
+       struct regmap *rmap = rdev_get_regmap(dev);
        int offset = (rdev_get_id(dev) - WM8400_DCDC1) * 2;
        int ret;
 
        switch (mode) {
        case REGULATOR_MODE_FAST:
                /* Datasheet: active with force PWM */
-               ret = wm8400_set_bits(wm8400, WM8400_DCDC1_CONTROL_2 + offset,
+               ret = regmap_update_bits(rmap, WM8400_DCDC1_CONTROL_2 + offset,
                                      WM8400_DC1_FRC_PWM, WM8400_DC1_FRC_PWM);
                if (ret != 0)
                        return ret;
 
-               return wm8400_set_bits(wm8400, WM8400_DCDC1_CONTROL_1 + offset,
+               return regmap_update_bits(rmap, WM8400_DCDC1_CONTROL_1 + offset,
                                       WM8400_DC1_ACTIVE | WM8400_DC1_SLEEP,
                                       WM8400_DC1_ACTIVE);
 
        case REGULATOR_MODE_NORMAL:
                /* Datasheet: active */
-               ret = wm8400_set_bits(wm8400, WM8400_DCDC1_CONTROL_2 + offset,
+               ret = regmap_update_bits(rmap, WM8400_DCDC1_CONTROL_2 + offset,
                                      WM8400_DC1_FRC_PWM, 0);
                if (ret != 0)
                        return ret;
 
-               return wm8400_set_bits(wm8400, WM8400_DCDC1_CONTROL_1 + offset,
+               return regmap_update_bits(rmap, WM8400_DCDC1_CONTROL_1 + offset,
                                       WM8400_DC1_ACTIVE | WM8400_DC1_SLEEP,
                                       WM8400_DC1_ACTIVE);
 
        case REGULATOR_MODE_IDLE:
                /* Datasheet: standby */
-               return wm8400_set_bits(wm8400, WM8400_DCDC1_CONTROL_1 + offset,
+               return regmap_update_bits(rmap, WM8400_DCDC1_CONTROL_1 + offset,
                                       WM8400_DC1_ACTIVE | WM8400_DC1_SLEEP, 0);
        default:
                return -EINVAL;

diff --git a/include/linux/mfd/wm8400-private.h b/include/linux/mfd/wm8400-private.h
index 4ee908f5b8348b6c2257c4b3689a2b97a3f58c41..43d0d307e2e348fbd6fb914951d7418a07bed136 100644 (file)
--- a/include/linux/mfd/wm8400-private.h
+++ b/include/linux/mfd/wm8400-private.h
@@ -923,12 +923,4 @@ struct wm8400 {
 #define WM8400_LINE_CMP_VTHD_SHIFT                   0  /* LINE_CMP_VTHD - [3:0] */
 #define WM8400_LINE_CMP_VTHD_WIDTH                   4  /* LINE_CMP_VTHD - [3:0] */
 
-int wm8400_block_read(struct wm8400 *wm8400, u8 reg, int count, u16 *data);
-
-static inline int wm8400_set_bits(struct wm8400 *wm8400, u8 reg,
-                                 u16 mask, u16 val)
-{
-       return regmap_update_bits(wm8400->regmap, reg, mask, val);
-}
-
 #endif