| Message ID | e3a3979657babf716e5f4072e373637ce86ad7ff.1601164493.git.mirq-linux@rere.qmqm.pl |
|---|---|
| State | Accepted |
| Commit | a233d4ebfc6f5b83ca576331090189686ae22118 |
| Headers | show |
| Series | tps65910: cleanup regmap use | expand |
On Sun, Sep 27, 2020 at 1:59 AM Michał Mirosław <mirq-linux@rere.qmqm.pl> wrote: > > Use regmap accessors directly for register manipulation - removing one > layer of abstraction. > > Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl> > --- > drivers/gpio/gpio-tps65910.c | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/drivers/gpio/gpio-tps65910.c b/drivers/gpio/gpio-tps65910.c > index 0c785b0fd161..0c0b445c75c0 100644 > --- a/drivers/gpio/gpio-tps65910.c > +++ b/drivers/gpio/gpio-tps65910.c > @@ -28,7 +28,7 @@ static int tps65910_gpio_get(struct gpio_chip *gc, unsigned offset) > struct tps65910 *tps65910 = tps65910_gpio->tps65910; > unsigned int val; > > - tps65910_reg_read(tps65910, TPS65910_GPIO0 + offset, &val); > + regmap_read(tps65910->regmap, TPS65910_GPIO0 + offset, &val); > > if (val & GPIO_STS_MASK) > return 1; > @@ -43,10 +43,10 @@ static void tps65910_gpio_set(struct gpio_chip *gc, unsigned offset, > struct tps65910 *tps65910 = tps65910_gpio->tps65910; > > if (value) > - tps65910_reg_set_bits(tps65910, TPS65910_GPIO0 + offset, > + regmap_set_bits(tps65910->regmap, TPS65910_GPIO0 + offset, > GPIO_SET_MASK); > else > - tps65910_reg_clear_bits(tps65910, TPS65910_GPIO0 + offset, > + regmap_clear_bits(tps65910->regmap, TPS65910_GPIO0 + offset, > GPIO_SET_MASK); > } > > @@ -59,7 +59,7 @@ static int tps65910_gpio_output(struct gpio_chip *gc, unsigned offset, > /* Set the initial value */ > tps65910_gpio_set(gc, offset, value); > > - return tps65910_reg_set_bits(tps65910, TPS65910_GPIO0 + offset, > + return regmap_set_bits(tps65910->regmap, TPS65910_GPIO0 + offset, > GPIO_CFG_MASK); > } > > @@ -68,7 +68,7 @@ static int tps65910_gpio_input(struct gpio_chip *gc, unsigned offset) > struct tps65910_gpio *tps65910_gpio = gpiochip_get_data(gc); > struct tps65910 *tps65910 = tps65910_gpio->tps65910; > > - return tps65910_reg_clear_bits(tps65910, TPS65910_GPIO0 + offset, > + return regmap_clear_bits(tps65910->regmap, TPS65910_GPIO0 + offset, > GPIO_CFG_MASK); > } > > @@ -157,7 +157,7 @@ static int tps65910_gpio_probe(struct platform_device *pdev) > if (!pdata->en_gpio_sleep[i]) > continue; > > - ret = tps65910_reg_set_bits(tps65910, > + ret = regmap_set_bits(tps65910->regmap, > TPS65910_GPIO0 + i, GPIO_SLEEP_MASK); > if (ret < 0) > dev_warn(tps65910->dev, > -- > 2.20.1 > Acked-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
On Wed, 30 Sep 2020, Linus Walleij wrote: > On Sun, Sep 27, 2020 at 1:59 AM Michał Mirosław <mirq-linux@rere.qmqm.pl> wrote: > > > Use regmap accessors directly for register manipulation - removing one > > layer of abstraction. > > > > Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl> > > Reviewed-by: Linus Walleij <linus.walleij@linaro.org> > > I suppose it is easiest that Lee apply all patches to the MFD tree? Yes, that's fine. It won't be for this release though, as we're already at -rc7.
On Sun, Sep 27, 2020 at 1:59 AM Michał Mirosław <mirq-linux@rere.qmqm.pl> wrote: > Use regmap accessors directly for register manipulation - removing one > layer of abstraction. > > Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl> Acked-by: Linus Walleij <linus.walleij@linaro.org> Yours, Linus Walleij
On Sun, 27 Sep 2020, Michał Mirosław wrote: > Use regmap accessors directly for register manipulation - removing one > layer of abstraction. > > Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl> > --- > drivers/gpio/gpio-tps65910.c | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) Applied, thanks. -- Lee Jones [李琼斯] Senior Technical Lead - Developer Services Linaro.org │ Open source software for Arm SoCs Follow Linaro: Facebook | Twitter | Blog
diff --git a/drivers/gpio/gpio-tps65910.c b/drivers/gpio/gpio-tps65910.c index 0c785b0fd161..0c0b445c75c0 100644 --- a/drivers/gpio/gpio-tps65910.c +++ b/drivers/gpio/gpio-tps65910.c @@ -28,7 +28,7 @@ static int tps65910_gpio_get(struct gpio_chip *gc, unsigned offset) struct tps65910 *tps65910 = tps65910_gpio->tps65910; unsigned int val; - tps65910_reg_read(tps65910, TPS65910_GPIO0 + offset, &val); + regmap_read(tps65910->regmap, TPS65910_GPIO0 + offset, &val); if (val & GPIO_STS_MASK) return 1; @@ -43,10 +43,10 @@ static void tps65910_gpio_set(struct gpio_chip *gc, unsigned offset, struct tps65910 *tps65910 = tps65910_gpio->tps65910; if (value) - tps65910_reg_set_bits(tps65910, TPS65910_GPIO0 + offset, + regmap_set_bits(tps65910->regmap, TPS65910_GPIO0 + offset, GPIO_SET_MASK); else - tps65910_reg_clear_bits(tps65910, TPS65910_GPIO0 + offset, + regmap_clear_bits(tps65910->regmap, TPS65910_GPIO0 + offset, GPIO_SET_MASK); } @@ -59,7 +59,7 @@ static int tps65910_gpio_output(struct gpio_chip *gc, unsigned offset, /* Set the initial value */ tps65910_gpio_set(gc, offset, value); - return tps65910_reg_set_bits(tps65910, TPS65910_GPIO0 + offset, + return regmap_set_bits(tps65910->regmap, TPS65910_GPIO0 + offset, GPIO_CFG_MASK); } @@ -68,7 +68,7 @@ static int tps65910_gpio_input(struct gpio_chip *gc, unsigned offset) struct tps65910_gpio *tps65910_gpio = gpiochip_get_data(gc); struct tps65910 *tps65910 = tps65910_gpio->tps65910; - return tps65910_reg_clear_bits(tps65910, TPS65910_GPIO0 + offset, + return regmap_clear_bits(tps65910->regmap, TPS65910_GPIO0 + offset, GPIO_CFG_MASK); } @@ -157,7 +157,7 @@ static int tps65910_gpio_probe(struct platform_device *pdev) if (!pdata->en_gpio_sleep[i]) continue; - ret = tps65910_reg_set_bits(tps65910, + ret = regmap_set_bits(tps65910->regmap, TPS65910_GPIO0 + i, GPIO_SLEEP_MASK); if (ret < 0) dev_warn(tps65910->dev,
Use regmap accessors directly for register manipulation - removing one layer of abstraction. Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl> --- drivers/gpio/gpio-tps65910.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)