lkml.org 
[lkml]   [2020]   [Sep]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 4/5] mfd: tps65910: clean up after switching to regmap
    Remove wrappers around regmap calls to remove now-useless indirection.

    Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
    ---
    drivers/mfd/tps65910.c | 16 ++++++++--------
    include/linux/mfd/tps65910.h | 35 -----------------------------------
    2 files changed, 8 insertions(+), 43 deletions(-)

    diff --git a/drivers/mfd/tps65910.c b/drivers/mfd/tps65910.c
    index 11959021b50a..36a52f44cd11 100644
    --- a/drivers/mfd/tps65910.c
    +++ b/drivers/mfd/tps65910.c
    @@ -292,7 +292,7 @@ static int tps65910_ck32k_init(struct tps65910 *tps65910,
    if (!pmic_pdata->en_ck32k_xtal)
    return 0;

    - ret = tps65910_reg_clear_bits(tps65910, TPS65910_DEVCTRL,
    + ret = regmap_clear_bits(tps65910->regmap, TPS65910_DEVCTRL,
    DEVCTRL_CK32K_CTRL_MASK);
    if (ret < 0) {
    dev_err(tps65910->dev, "clear ck32k_ctrl failed: %d\n", ret);
    @@ -314,7 +314,7 @@ static int tps65910_sleepinit(struct tps65910 *tps65910,
    dev = tps65910->dev;

    /* enabling SLEEP device state */
    - ret = tps65910_reg_set_bits(tps65910, TPS65910_DEVCTRL,
    + ret = regmap_set_bits(tps65910->regmap, TPS65910_DEVCTRL,
    DEVCTRL_DEV_SLP_MASK);
    if (ret < 0) {
    dev_err(dev, "set dev_slp failed: %d\n", ret);
    @@ -322,7 +322,7 @@ static int tps65910_sleepinit(struct tps65910 *tps65910,
    }

    if (pmic_pdata->slp_keepon.therm_keepon) {
    - ret = tps65910_reg_set_bits(tps65910,
    + ret = regmap_set_bits(tps65910->regmap,
    TPS65910_SLEEP_KEEP_RES_ON,
    SLEEP_KEEP_RES_ON_THERM_KEEPON_MASK);
    if (ret < 0) {
    @@ -332,7 +332,7 @@ static int tps65910_sleepinit(struct tps65910 *tps65910,
    }

    if (pmic_pdata->slp_keepon.clkout32k_keepon) {
    - ret = tps65910_reg_set_bits(tps65910,
    + ret = regmap_set_bits(tps65910->regmap,
    TPS65910_SLEEP_KEEP_RES_ON,
    SLEEP_KEEP_RES_ON_CLKOUT32K_KEEPON_MASK);
    if (ret < 0) {
    @@ -342,7 +342,7 @@ static int tps65910_sleepinit(struct tps65910 *tps65910,
    }

    if (pmic_pdata->slp_keepon.i2chs_keepon) {
    - ret = tps65910_reg_set_bits(tps65910,
    + ret = regmap_set_bits(tps65910->regmap,
    TPS65910_SLEEP_KEEP_RES_ON,
    SLEEP_KEEP_RES_ON_I2CHS_KEEPON_MASK);
    if (ret < 0) {
    @@ -354,7 +354,7 @@ static int tps65910_sleepinit(struct tps65910 *tps65910,
    return 0;

    disable_dev_slp:
    - tps65910_reg_clear_bits(tps65910, TPS65910_DEVCTRL,
    + regmap_clear_bits(tps65910->regmap, TPS65910_DEVCTRL,
    DEVCTRL_DEV_SLP_MASK);

    err_sleep_init:
    @@ -436,11 +436,11 @@ static void tps65910_power_off(void)

    tps65910 = dev_get_drvdata(&tps65910_i2c_client->dev);

    - if (tps65910_reg_set_bits(tps65910, TPS65910_DEVCTRL,
    + if (regmap_set_bits(tps65910->regmap, TPS65910_DEVCTRL,
    DEVCTRL_PWR_OFF_MASK) < 0)
    return;

    - tps65910_reg_clear_bits(tps65910, TPS65910_DEVCTRL,
    + regmap_clear_bits(tps65910->regmap, TPS65910_DEVCTRL,
    DEVCTRL_DEV_ON_MASK);
    }

    diff --git a/include/linux/mfd/tps65910.h b/include/linux/mfd/tps65910.h
    index ce4b9e743f7c..f7398d982f23 100644
    --- a/include/linux/mfd/tps65910.h
    +++ b/include/linux/mfd/tps65910.h
    @@ -913,39 +913,4 @@ static inline int tps65910_chip_id(struct tps65910 *tps65910)
    return tps65910->id;
    }

    -static inline int tps65910_reg_read(struct tps65910 *tps65910, u8 reg,
    - unsigned int *val)
    -{
    - return regmap_read(tps65910->regmap, reg, val);
    -}
    -
    -static inline int tps65910_reg_write(struct tps65910 *tps65910, u8 reg,
    - unsigned int val)
    -{
    - return regmap_write(tps65910->regmap, reg, val);
    -}
    -
    -static inline int tps65910_reg_set_bits(struct tps65910 *tps65910, u8 reg,
    - u8 mask)
    -{
    - return regmap_update_bits(tps65910->regmap, reg, mask, mask);
    -}
    -
    -static inline int tps65910_reg_clear_bits(struct tps65910 *tps65910, u8 reg,
    - u8 mask)
    -{
    - return regmap_update_bits(tps65910->regmap, reg, mask, 0);
    -}
    -
    -static inline int tps65910_reg_update_bits(struct tps65910 *tps65910, u8 reg,
    - u8 mask, u8 val)
    -{
    - return regmap_update_bits(tps65910->regmap, reg, mask, val);
    -}
    -
    -static inline int tps65910_irq_get_virq(struct tps65910 *tps65910, int irq)
    -{
    - return regmap_irq_get_virq(tps65910->irq_data, irq);
    -}
    -
    #endif /* __LINUX_MFD_TPS65910_H */
    --
    2.20.1
    \
     
     \ /
      Last update: 2020-09-27 02:00    [W:4.703 / U:0.056 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site