lkml.org 
[lkml]   [2023]   [Oct]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v3 44/73] treewide: rename pinctrl_gpio_free_new()
    Date
    From: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>

    Now that pinctrl_gpio_free()() is no longer used, let's drop the '_new'
    suffix from its improved variant.

    Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
    ---
    drivers/gpio/gpio-aspeed.c | 2 +-
    drivers/gpio/gpio-em.c | 2 +-
    drivers/gpio/gpio-rcar.c | 2 +-
    drivers/gpio/gpio-tegra.c | 2 +-
    drivers/gpio/gpiolib.c | 2 +-
    drivers/pinctrl/bcm/pinctrl-iproc-gpio.c | 2 +-
    drivers/pinctrl/core.c | 6 +++---
    drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c | 2 +-
    drivers/pinctrl/nuvoton/pinctrl-npcm8xx.c | 2 +-
    drivers/pinctrl/renesas/gpio.c | 2 +-
    drivers/pinctrl/renesas/pinctrl-rzg2l.c | 2 +-
    drivers/pinctrl/renesas/pinctrl-rzv2m.c | 2 +-
    drivers/pinctrl/spear/pinctrl-plgpio.c | 4 ++--
    drivers/pinctrl/starfive/pinctrl-starfive-jh7100.c | 2 +-
    drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c | 2 +-
    drivers/pinctrl/stm32/pinctrl-stm32.c | 2 +-
    include/linux/pinctrl/consumer.h | 4 ++--
    17 files changed, 21 insertions(+), 21 deletions(-)

    diff --git a/drivers/gpio/gpio-aspeed.c b/drivers/gpio/gpio-aspeed.c
    index af851c89cacc..4c417c8486dd 100644
    --- a/drivers/gpio/gpio-aspeed.c
    +++ b/drivers/gpio/gpio-aspeed.c
    @@ -755,7 +755,7 @@ static int aspeed_gpio_request(struct gpio_chip *chip, unsigned int offset)

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

    static int usecs_to_cycles(struct aspeed_gpio *gpio, unsigned long usecs,
    diff --git a/drivers/gpio/gpio-em.c b/drivers/gpio/gpio-em.c
    index 08c5427deb71..aa31c189d0ef 100644
    --- a/drivers/gpio/gpio-em.c
    +++ b/drivers/gpio/gpio-em.c
    @@ -234,7 +234,7 @@ static int em_gio_request(struct gpio_chip *chip, unsigned offset)

    static void em_gio_free(struct gpio_chip *chip, unsigned offset)
    {
    - pinctrl_gpio_free_new(chip, offset);
    + pinctrl_gpio_free(chip, offset);

    /* Set the GPIO as an input to ensure that the next GPIO request won't
    * drive the GPIO pin as an output.
    diff --git a/drivers/gpio/gpio-rcar.c b/drivers/gpio/gpio-rcar.c
    index 8c98730a7ad2..6159fda38d5d 100644
    --- a/drivers/gpio/gpio-rcar.c
    +++ b/drivers/gpio/gpio-rcar.c
    @@ -286,7 +286,7 @@ static void gpio_rcar_free(struct gpio_chip *chip, unsigned offset)
    {
    struct gpio_rcar_priv *p = gpiochip_get_data(chip);

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

    /*
    * Set the GPIO as an input to ensure that the next GPIO request won't
    diff --git a/drivers/gpio/gpio-tegra.c b/drivers/gpio/gpio-tegra.c
    index c974ba368d18..fcb3b474d1df 100644
    --- a/drivers/gpio/gpio-tegra.c
    +++ b/drivers/gpio/gpio-tegra.c
    @@ -146,7 +146,7 @@ static void tegra_gpio_free(struct gpio_chip *chip, unsigned int offset)
    {
    struct tegra_gpio_info *tgi = gpiochip_get_data(chip);

    - pinctrl_gpio_free_new(chip, offset);
    + pinctrl_gpio_free(chip, offset);
    tegra_gpio_disable(tgi, offset);
    }

    diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
    index 794408be7109..53dce41d649a 100644
    --- a/drivers/gpio/gpiolib.c
    +++ b/drivers/gpio/gpiolib.c
    @@ -2052,7 +2052,7 @@ void gpiochip_generic_free(struct gpio_chip *gc, unsigned int offset)
    return;
    #endif

    - pinctrl_gpio_free_new(gc, offset);
    + pinctrl_gpio_free(gc, offset);
    }
    EXPORT_SYMBOL_GPL(gpiochip_generic_free);

    diff --git a/drivers/pinctrl/bcm/pinctrl-iproc-gpio.c b/drivers/pinctrl/bcm/pinctrl-iproc-gpio.c
    index 8162dd840933..fd5ce52d05b1 100644
    --- a/drivers/pinctrl/bcm/pinctrl-iproc-gpio.c
    +++ b/drivers/pinctrl/bcm/pinctrl-iproc-gpio.c
    @@ -345,7 +345,7 @@ static void iproc_gpio_free(struct gpio_chip *gc, unsigned offset)
    if (!chip->pinmux_is_supported)
    return;

    - pinctrl_gpio_free_new(gc, offset);
    + pinctrl_gpio_free(gc, offset);
    }

    static int iproc_gpio_direction_input(struct gpio_chip *gc, unsigned gpio)
    diff --git a/drivers/pinctrl/core.c b/drivers/pinctrl/core.c
    index d200a887dc5d..6872614c4a95 100644
    --- a/drivers/pinctrl/core.c
    +++ b/drivers/pinctrl/core.c
    @@ -820,7 +820,7 @@ int pinctrl_gpio_request(struct gpio_chip *gc, unsigned int offset)
    EXPORT_SYMBOL_GPL(pinctrl_gpio_request);

    /**
    - * pinctrl_gpio_free_new() - free control on a single pin, currently used as GPIO
    + * pinctrl_gpio_free() - free control on a single pin, currently used as GPIO
    * @gc: GPIO chip structure from the GPIO subsystem
    * @offset: hardware offset of the GPIO relative to the controller
    *
    @@ -828,7 +828,7 @@ EXPORT_SYMBOL_GPL(pinctrl_gpio_request);
    * as part of their gpio_request() semantics, platforms and individual drivers
    * shall *NOT* request GPIO pins to be muxed in.
    */
    -void pinctrl_gpio_free_new(struct gpio_chip *gc, unsigned int offset)
    +void pinctrl_gpio_free(struct gpio_chip *gc, unsigned int offset)
    {
    struct pinctrl_gpio_range *range;
    struct pinctrl_dev *pctldev;
    @@ -848,7 +848,7 @@ void pinctrl_gpio_free_new(struct gpio_chip *gc, unsigned int offset)

    mutex_unlock(&pctldev->mutex);
    }
    -EXPORT_SYMBOL_GPL(pinctrl_gpio_free_new);
    +EXPORT_SYMBOL_GPL(pinctrl_gpio_free);

    static int pinctrl_gpio_direction(unsigned gpio, bool input)
    {
    diff --git a/drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c b/drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c
    index ad39b8c060b7..ab7cfc1e66f0 100644
    --- a/drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c
    +++ b/drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c
    @@ -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_new(chip, offset);
    + pinctrl_gpio_free(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 dd4532ae62bf..78dbeef6af86 100644
    --- a/drivers/pinctrl/nuvoton/pinctrl-npcm8xx.c
    +++ b/drivers/pinctrl/nuvoton/pinctrl-npcm8xx.c
    @@ -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_new(chip, offset);
    + pinctrl_gpio_free(chip, offset);
    }

    static void npcmgpio_irq_handler(struct irq_desc *desc)
    diff --git a/drivers/pinctrl/renesas/gpio.c b/drivers/pinctrl/renesas/gpio.c
    index 0c4f4d8d0891..b39125a632b0 100644
    --- a/drivers/pinctrl/renesas/gpio.c
    +++ b/drivers/pinctrl/renesas/gpio.c
    @@ -140,7 +140,7 @@ static int gpio_pin_request(struct gpio_chip *gc, unsigned offset)

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

    static void gpio_pin_set_value(struct sh_pfc_chip *chip, unsigned offset,
    diff --git a/drivers/pinctrl/renesas/pinctrl-rzg2l.c b/drivers/pinctrl/renesas/pinctrl-rzg2l.c
    index c5d247d24374..9de350ad7e7d 100644
    --- a/drivers/pinctrl/renesas/pinctrl-rzg2l.c
    +++ b/drivers/pinctrl/renesas/pinctrl-rzg2l.c
    @@ -1181,7 +1181,7 @@ static void rzg2l_gpio_free(struct gpio_chip *chip, unsigned int offset)
    {
    unsigned int virq;

    - pinctrl_gpio_free_new(chip, offset);
    + pinctrl_gpio_free(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 1ec0922f735c..21d7d5ac8c4a 100644
    --- a/drivers/pinctrl/renesas/pinctrl-rzv2m.c
    +++ b/drivers/pinctrl/renesas/pinctrl-rzv2m.c
    @@ -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_new(chip, offset);
    + pinctrl_gpio_free(chip, offset);

    /*
    * Set the GPIO as an input to ensure that the next GPIO request won't
    diff --git a/drivers/pinctrl/spear/pinctrl-plgpio.c b/drivers/pinctrl/spear/pinctrl-plgpio.c
    index 6d3b7ce1c35a..a05570c7d833 100644
    --- a/drivers/pinctrl/spear/pinctrl-plgpio.c
    +++ b/drivers/pinctrl/spear/pinctrl-plgpio.c
    @@ -248,7 +248,7 @@ static int plgpio_request(struct gpio_chip *chip, unsigned offset)
    if (!IS_ERR(plgpio->clk))
    clk_disable(plgpio->clk);
    err0:
    - pinctrl_gpio_free_new(chip, offset);
    + pinctrl_gpio_free(chip, offset);
    return ret;
    }

    @@ -278,7 +278,7 @@ static void plgpio_free(struct gpio_chip *chip, unsigned offset)
    if (!IS_ERR(plgpio->clk))
    clk_disable(plgpio->clk);

    - pinctrl_gpio_free_new(chip, offset);
    + pinctrl_gpio_free(chip, offset);
    }

    /* PLGPIO IRQ */
    diff --git a/drivers/pinctrl/starfive/pinctrl-starfive-jh7100.c b/drivers/pinctrl/starfive/pinctrl-starfive-jh7100.c
    index 88e39f68ef25..7beed57d665a 100644
    --- a/drivers/pinctrl/starfive/pinctrl-starfive-jh7100.c
    +++ b/drivers/pinctrl/starfive/pinctrl-starfive-jh7100.c
    @@ -923,7 +923,7 @@ static int starfive_gpio_request(struct gpio_chip *gc, unsigned int gpio)

    static void starfive_gpio_free(struct gpio_chip *gc, unsigned int gpio)
    {
    - pinctrl_gpio_free_new(gc, gpio);
    + pinctrl_gpio_free(gc, gpio);
    }

    static int starfive_gpio_get_direction(struct gpio_chip *gc, unsigned int gpio)
    diff --git a/drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c b/drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c
    index c458c6fb992f..695c8c0a6e8b 100644
    --- a/drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c
    +++ b/drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c
    @@ -552,7 +552,7 @@ static int jh7110_gpio_request(struct gpio_chip *gc, unsigned int gpio)

    static void jh7110_gpio_free(struct gpio_chip *gc, unsigned int gpio)
    {
    - pinctrl_gpio_free_new(gc, gpio);
    + pinctrl_gpio_free(gc, gpio);
    }

    static int jh7110_gpio_get_direction(struct gpio_chip *gc,
    diff --git a/drivers/pinctrl/stm32/pinctrl-stm32.c b/drivers/pinctrl/stm32/pinctrl-stm32.c
    index dddbdc1a64c5..e4453fa58f9e 100644
    --- a/drivers/pinctrl/stm32/pinctrl-stm32.c
    +++ b/drivers/pinctrl/stm32/pinctrl-stm32.c
    @@ -222,7 +222,7 @@ static int stm32_gpio_request(struct gpio_chip *chip, unsigned offset)

    static void stm32_gpio_free(struct gpio_chip *chip, unsigned offset)
    {
    - pinctrl_gpio_free_new(chip, offset);
    + pinctrl_gpio_free(chip, offset);
    }

    static int stm32_gpio_get(struct gpio_chip *chip, unsigned offset)
    diff --git a/include/linux/pinctrl/consumer.h b/include/linux/pinctrl/consumer.h
    index 05b2dae05f24..55b465edaff1 100644
    --- a/include/linux/pinctrl/consumer.h
    +++ b/include/linux/pinctrl/consumer.h
    @@ -28,7 +28,7 @@ struct pinctrl_state;
    /* External interface to pin control */
    bool pinctrl_gpio_can_use_line(struct gpio_chip *gc, unsigned int offset);
    int pinctrl_gpio_request(struct gpio_chip *gc, unsigned int offset);
    -void pinctrl_gpio_free_new(struct gpio_chip *gc, unsigned int offset);
    +void pinctrl_gpio_free(struct gpio_chip *gc, unsigned int offset);
    int pinctrl_gpio_direction_input_new(struct gpio_chip *gc,
    unsigned int offset);
    int pinctrl_gpio_direction_output_new(struct gpio_chip *gc,
    @@ -80,7 +80,7 @@ pinctrl_gpio_request(struct gpio_chip *gc, unsigned int offset)
    }

    static inline void
    -pinctrl_gpio_free_new(struct gpio_chip *gc, unsigned int offset)
    +pinctrl_gpio_free(struct gpio_chip *gc, unsigned int offset)
    {
    }

    --
    2.39.2
    \
     
     \ /
      Last update: 2023-10-17 14:22    [W:4.175 / U:0.560 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site