diff mbox series

[11/36] gpio: rockchip: use new pinctrl GPIO helpers

Message ID	20231003145114.21637-12-brgl@bgdev.pl
State	Superseded
Headers	show Return-Path: <linux-gpio-owner@vger.kernel.org> From: Bartosz Golaszewski <brgl@bgdev.pl> To: Linus Walleij <linus.walleij@linaro.org>, Andy Shevchenko <andy@kernel.org> Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski <bartosz.golaszewski@linaro.org>, Heiko Stuebner <heiko@sntech.de>, linux-rockchip@lists.infradead.org Subject: [PATCH 11/36] gpio: rockchip: use new pinctrl GPIO helpers Date: Tue, 3 Oct 2023 16:50:49 +0200 Message-Id: <20231003145114.21637-12-brgl@bgdev.pl> In-Reply-To: <20231003145114.21637-1-brgl@bgdev.pl> References: <20231003145114.21637-1-brgl@bgdev.pl> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	pinctrl: don't use GPIOLIB global numberspace in helpers \| expand [00/36] pinctrl: don't use GPIOLIB global numberspace in helpers [01/36] pinctrl: remove unneeded extern specifiers from consumer.h [02/36] pinctrl: provide new GPIO-to-pinctrl glue helpers [03/36] gpiolib: generic: use new pinctrl GPIO helpers [04/36] gpio: cdev: use pinctrl_gpio_can_use_line_new() [05/36] gpio: rcar: use new pinctrl GPIO helpers [06/36] gpio: tegra: use new pinctrl GPIO helpers [07/36] gpio: em: use new pinctrl GPIO helpers [08/36] gpio: aspeed: use new pinctrl GPIO helpers [09/36] gpio: mvebu: use new pinctrl GPIO helpers [10/36] gpio: pxa: use new pinctrl GPIO helpers [11/36] gpio: rockchip: use new pinctrl GPIO helpers [12/36] gpio: vf610: use new pinctrl GPIO helpers [13/36] pinctrl: nuvoton: use new pinctrl GPIO helpers [14/36] pinctrl: renesas: use new pinctrl GPIO helpers [15/36] pinctrl: bcm: use new pinctrl GPIO helpers [16/36] pinctrl: stm32: use new pinctrl GPIO helpers [17/36] pinctrl: spear: use new pinctrl GPIO helpers [18/36] pinctrl: starfive: use new pinctrl GPIO helpers [19/36] pinctrl: ocelot: use new pinctrl GPIO helpers [20/36] pinctrl: rk805: use new pinctrl GPIO helpers [21/36] pinctrl: cirrus: use new pinctrl GPIO helpers [22/36] pinctrl: mediatek: use new pinctrl GPIO helpers [23/36] pinctrl: axp209: use new pinctrl GPIO helpers [24/36] pinctrl: vt8500: use new pinctrl GPIO helpers [25/36] pinctrl: cy8c95x0: use new pinctrl GPIO helpers [26/36] pinctrl: as3722: use new pinctrl GPIO helpers [27/36] pinctrl: ingenic: use new pinctrl GPIO helpers [28/36] pinctrl: intel: use new pinctrl GPIO helpers [29/36] pinctrl: st: use new pinctrl GPIO helpers [30/36] pinctrl: remove old GPIO helpers [31/36] treewide: rename pinctrl_gpio_can_use_line_new() [32/36] treewide: rename pinctrl_gpio_request_new() [33/36] treewide: rename pinctrl_gpio_free_new() [34/36] treewide: rename pinctrl_gpio_direction_input_new() [35/36] treewide: rename pinctrl_gpio_direction_output_new() [36/36] treewide: rename pinctrl_gpio_set_config_new()

Commit Message

Bartosz Golaszewski Oct. 3, 2023, 2:50 p.m. UTC

From: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>

Replace the pinctrl helpers taking the global GPIO number as argument
with the improved variants that instead take a pointer to the GPIO chip
and the controller-relative offset.

Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
---
 drivers/gpio/gpio-rockchip.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff mbox series

Patch

diff --git a/drivers/gpio/gpio-rockchip.c b/drivers/gpio/gpio-rockchip.c
index 23040a8cea34..3576793f0bd9 100644
--- a/drivers/gpio/gpio-rockchip.c
+++ b/drivers/gpio/gpio-rockchip.c
@@ -159,9 +159,9 @@  static int rockchip_gpio_set_direction(struct gpio_chip *chip,
 
 
 	if (input)
-		pinctrl_gpio_direction_input(bank->pin_base + offset);
+		pinctrl_gpio_direction_input_new(chip, offset);
 	else
-		pinctrl_gpio_direction_output(bank->pin_base + offset);
+		pinctrl_gpio_direction_output_new(chip, offset);
 
 	raw_spin_lock_irqsave(&bank->slock, flags);
 	rockchip_gpio_writel_bit(bank, offset, data, bank->gpio_regs->port_ddr);