lkml.org 
[lkml]   [2023]   [Oct]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 14/36] pinctrl: renesas: use new pinctrl GPIO helpers
    Date
    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/pinctrl/renesas/gpio.c | 8 ++++----
    drivers/pinctrl/renesas/pinctrl-rzg2l.c | 4 ++--
    drivers/pinctrl/renesas/pinctrl-rzv2m.c | 4 ++--
    3 files changed, 8 insertions(+), 8 deletions(-)

    diff --git a/drivers/pinctrl/renesas/gpio.c b/drivers/pinctrl/renesas/gpio.c
    index 5758daf94fe2..e7771a57e6d1 100644
    --- a/drivers/pinctrl/renesas/gpio.c
    +++ b/drivers/pinctrl/renesas/gpio.c
    @@ -135,12 +135,12 @@ static int gpio_pin_request(struct gpio_chip *gc, unsigned offset)
    if (idx < 0 || pfc->info->pins[idx].enum_id == 0)
    return -EINVAL;

    - return pinctrl_gpio_request(gc->base + offset);
    + return pinctrl_gpio_request_new(gc, offset);
    }

    static void gpio_pin_free(struct gpio_chip *gc, unsigned offset)
    {
    - return pinctrl_gpio_free(gc->base + offset);
    + return pinctrl_gpio_free_new(gc, offset);
    }

    static void gpio_pin_set_value(struct sh_pfc_chip *chip, unsigned offset,
    @@ -164,7 +164,7 @@ static void gpio_pin_set_value(struct sh_pfc_chip *chip, unsigned offset,

    static int gpio_pin_direction_input(struct gpio_chip *gc, unsigned offset)
    {
    - return pinctrl_gpio_direction_input(gc->base + offset);
    + return pinctrl_gpio_direction_input_new(gc, offset);
    }

    static int gpio_pin_direction_output(struct gpio_chip *gc, unsigned offset,
    @@ -172,7 +172,7 @@ static int gpio_pin_direction_output(struct gpio_chip *gc, unsigned offset,
    {
    gpio_pin_set_value(gpiochip_get_data(gc), offset, value);

    - return pinctrl_gpio_direction_output(gc->base + offset);
    + return pinctrl_gpio_direction_output_new(gc, offset);
    }

    static int gpio_pin_get(struct gpio_chip *gc, unsigned offset)
    diff --git a/drivers/pinctrl/renesas/pinctrl-rzg2l.c b/drivers/pinctrl/renesas/pinctrl-rzg2l.c
    index 03b36c6b2b6d..b9195fff0abd 100644
    --- a/drivers/pinctrl/renesas/pinctrl-rzg2l.c
    +++ b/drivers/pinctrl/renesas/pinctrl-rzg2l.c
    @@ -801,7 +801,7 @@ static int rzg2l_gpio_request(struct gpio_chip *chip, unsigned int offset)
    u8 reg8;
    int ret;

    - ret = pinctrl_gpio_request(chip->base + offset);
    + ret = pinctrl_gpio_request_new(chip, offset);
    if (ret)
    return ret;

    @@ -920,7 +920,7 @@ static void rzg2l_gpio_free(struct gpio_chip *chip, unsigned int offset)
    {
    unsigned int virq;

    - pinctrl_gpio_free(chip->base + offset);
    + pinctrl_gpio_free_new(chip, offset);

    virq = irq_find_mapping(chip->irq.domain, offset);
    if (virq)
    diff --git a/drivers/pinctrl/renesas/pinctrl-rzv2m.c b/drivers/pinctrl/renesas/pinctrl-rzv2m.c
    index 52aeafaba4b6..3d29c77a5aad 100644
    --- a/drivers/pinctrl/renesas/pinctrl-rzv2m.c
    +++ b/drivers/pinctrl/renesas/pinctrl-rzv2m.c
    @@ -754,7 +754,7 @@ static int rzv2m_gpio_request(struct gpio_chip *chip, unsigned int offset)
    u8 bit = RZV2M_PIN_ID_TO_PIN(offset);
    int ret;

    - ret = pinctrl_gpio_request(chip->base + offset);
    + ret = pinctrl_gpio_request_new(chip, offset);
    if (ret)
    return ret;

    @@ -832,7 +832,7 @@ static int rzv2m_gpio_get(struct gpio_chip *chip, unsigned int offset)

    static void rzv2m_gpio_free(struct gpio_chip *chip, unsigned int offset)
    {
    - pinctrl_gpio_free(chip->base + offset);
    + pinctrl_gpio_free_new(chip, offset);

    /*
    * Set the GPIO as an input to ensure that the next GPIO request won't
    --
    2.39.2
    \
     
     \ /
      Last update: 2023-10-03 16:53    [W:2.230 / U:0.912 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site