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 13/36] pinctrl: nuvoton: 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/nuvoton/pinctrl-npcm7xx.c | 8 ++++----
    drivers/pinctrl/nuvoton/pinctrl-npcm8xx.c | 8 ++++----
    2 files changed, 8 insertions(+), 8 deletions(-)

    diff --git a/drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c b/drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c
    index 8bdd0124e2eb..62134a7f0b4e 100644
    --- a/drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c
    +++ b/drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c
    @@ -171,7 +171,7 @@ static int npcmgpio_direction_input(struct gpio_chip *chip, unsigned int offset)
    struct npcm7xx_gpio *bank = gpiochip_get_data(chip);
    int ret;

    - ret = pinctrl_gpio_direction_input(offset + chip->base);
    + ret = pinctrl_gpio_direction_input_new(chip, offset);
    if (ret)
    return ret;

    @@ -188,7 +188,7 @@ static int npcmgpio_direction_output(struct gpio_chip *chip,
    dev_dbg(chip->parent, "gpio_direction_output: offset%d = %x\n", offset,
    value);

    - ret = pinctrl_gpio_direction_output(offset + chip->base);
    + ret = pinctrl_gpio_direction_output_new(chip, offset);
    if (ret)
    return ret;

    @@ -201,7 +201,7 @@ static int npcmgpio_gpio_request(struct gpio_chip *chip, unsigned int offset)
    int ret;

    dev_dbg(chip->parent, "gpio_request: offset%d\n", offset);
    - ret = pinctrl_gpio_request(offset + chip->base);
    + ret = pinctrl_gpio_request_new(chip, offset);
    if (ret)
    return ret;

    @@ -211,7 +211,7 @@ static int npcmgpio_gpio_request(struct gpio_chip *chip, unsigned int offset)
    static void npcmgpio_gpio_free(struct gpio_chip *chip, unsigned int offset)
    {
    dev_dbg(chip->parent, "gpio_free: offset%d\n", offset);
    - pinctrl_gpio_free(offset + chip->base);
    + pinctrl_gpio_free_new(chip, offset);
    }

    static void npcmgpio_irq_handler(struct irq_desc *desc)
    diff --git a/drivers/pinctrl/nuvoton/pinctrl-npcm8xx.c b/drivers/pinctrl/nuvoton/pinctrl-npcm8xx.c
    index da21f6a45888..0b6d6964087e 100644
    --- a/drivers/pinctrl/nuvoton/pinctrl-npcm8xx.c
    +++ b/drivers/pinctrl/nuvoton/pinctrl-npcm8xx.c
    @@ -173,7 +173,7 @@ static int npcmgpio_direction_input(struct gpio_chip *chip, unsigned int offset)
    struct npcm8xx_gpio *bank = gpiochip_get_data(chip);
    int ret;

    - ret = pinctrl_gpio_direction_input(offset + chip->base);
    + ret = pinctrl_gpio_direction_input_new(chip, offset);
    if (ret)
    return ret;

    @@ -186,7 +186,7 @@ static int npcmgpio_direction_output(struct gpio_chip *chip,
    struct npcm8xx_gpio *bank = gpiochip_get_data(chip);
    int ret;

    - ret = pinctrl_gpio_direction_output(offset + chip->base);
    + ret = pinctrl_gpio_direction_output_new(chip, offset);
    if (ret)
    return ret;

    @@ -198,7 +198,7 @@ static int npcmgpio_gpio_request(struct gpio_chip *chip, unsigned int offset)
    struct npcm8xx_gpio *bank = gpiochip_get_data(chip);
    int ret;

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

    @@ -207,7 +207,7 @@ static int npcmgpio_gpio_request(struct gpio_chip *chip, unsigned int offset)

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

    static void npcmgpio_irq_handler(struct irq_desc *desc)
    --
    2.39.2
    \
     
     \ /
      Last update: 2023-10-03 16:52    [W:4.551 / U:0.048 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site