treewide: rename pinctrl_gpio_free_new()

Bartosz Golaszewski · Bartosz Golaszewski · commit 4fccb263f3a0 · 2023-11-04T10:23:21.000+01:00
Now that pinctrl_gpio_free()() is no longer used, let's drop the '_new'
suffix from its improved variant.

Signed-off-by: Bartosz Golaszewski &lt;bartosz.golaszewski@linaro.org&gt;
Acked-by: Linus Walleij &lt;linus.walleij@linaro.org&gt;
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -2030,7 +2030,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
@@ -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
@@ -820,15 +820,15 @@ 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
  *
  * This function should *ONLY* be used from gpiolib-based GPIO drivers,
  * 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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)
 {
 }
 

Original file line number	Diff line number	Diff line change
`@@ -755,7 +755,7 @@ static int aspeed_gpio_request(struct gpio_chip *chip, unsigned int offset)`
`755`	`755`
`756`	`756`	`static void aspeed_gpio_free(struct gpio_chip *chip, unsigned int offset)`
`757`	`757`	`{`
`758`		`- pinctrl_gpio_free_new(chip, offset);`
	`758`	`+ pinctrl_gpio_free(chip, offset);`
`759`	`759`	`}`
`760`	`760`
`761`	`761`	`static int usecs_to_cycles(struct aspeed_gpio *gpio, unsigned long usecs,`
Original file line number	Diff line number	Diff line change
`@@ -234,7 +234,7 @@ static int em_gio_request(struct gpio_chip *chip, unsigned offset)`
`234`	`234`
`235`	`235`	`static void em_gio_free(struct gpio_chip *chip, unsigned offset)`
`236`	`236`	`{`
`237`		`- pinctrl_gpio_free_new(chip, offset);`
	`237`	`+ pinctrl_gpio_free(chip, offset);`
`238`	`238`
`239`	`239`	`/* Set the GPIO as an input to ensure that the next GPIO request won't`
`240`	`240`	`* drive the GPIO pin as an output.`
Original file line number	Diff line number	Diff line change
`@@ -286,7 +286,7 @@ static void gpio_rcar_free(struct gpio_chip *chip, unsigned offset)`
`286`	`286`	`{`
`287`	`287`	`struct gpio_rcar_priv *p = gpiochip_get_data(chip);`
`288`	`288`
`289`		`- pinctrl_gpio_free_new(chip, offset);`
	`289`	`+ pinctrl_gpio_free(chip, offset);`
`290`	`290`
`291`	`291`	`/*`
`292`	`292`	`* Set the GPIO as an input to ensure that the next GPIO request won't`
Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,7 @@ static void tegra_gpio_free(struct gpio_chip *chip, unsigned int offset)`
`146`	`146`	`{`
`147`	`147`	`struct tegra_gpio_info *tgi = gpiochip_get_data(chip);`
`148`	`148`
`149`		`- pinctrl_gpio_free_new(chip, offset);`
	`149`	`+ pinctrl_gpio_free(chip, offset);`
`150`	`150`	`tegra_gpio_disable(tgi, offset);`
`151`	`151`	`}`
`152`	`152`
Original file line number	Diff line number	Diff line change
`@@ -2030,7 +2030,7 @@ void gpiochip_generic_free(struct gpio_chip *gc, unsigned int offset)`
`2030`	`2030`	`return;`
`2031`	`2031`	`#endif`
`2032`	`2032`
`2033`		`- pinctrl_gpio_free_new(gc, offset);`
	`2033`	`+ pinctrl_gpio_free(gc, offset);`
`2034`	`2034`	`}`
`2035`	`2035`	`EXPORT_SYMBOL_GPL(gpiochip_generic_free);`
`2036`	`2036`
Original file line number	Diff line number	Diff line change
`@@ -345,7 +345,7 @@ static void iproc_gpio_free(struct gpio_chip *gc, unsigned offset)`
`345`	`345`	`if (!chip->pinmux_is_supported)`
`346`	`346`	`return;`
`347`	`347`
`348`		`- pinctrl_gpio_free_new(gc, offset);`
	`348`	`+ pinctrl_gpio_free(gc, offset);`
`349`	`349`	`}`
`350`	`350`
`351`	`351`	`static int iproc_gpio_direction_input(struct gpio_chip *gc, unsigned gpio)`
Original file line number	Diff line number	Diff line change
`@@ -820,15 +820,15 @@ int pinctrl_gpio_request(struct gpio_chip *gc, unsigned int offset)`
`820`	`820`	`EXPORT_SYMBOL_GPL(pinctrl_gpio_request);`
`821`	`821`
`822`	`822`	`/**`
`823`		`- * pinctrl_gpio_free_new() - free control on a single pin, currently used as GPIO`
	`823`	`+ * pinctrl_gpio_free() - free control on a single pin, currently used as GPIO`
`824`	`824`	`* @gc: GPIO chip structure from the GPIO subsystem`
`825`	`825`	`* @offset: hardware offset of the GPIO relative to the controller`
`826`	`826`	`*`
`827`	`827`	`* This function should ONLY be used from gpiolib-based GPIO drivers,`
`828`	`828`	`* as part of their gpio_request() semantics, platforms and individual drivers`
`829`	`829`	`* shall NOT request GPIO pins to be muxed in.`
`830`	`830`	`*/`
`831`		`-void pinctrl_gpio_free_new(struct gpio_chip *gc, unsigned int offset)`
	`831`	`+void pinctrl_gpio_free(struct gpio_chip *gc, unsigned int offset)`
`832`	`832`	`{`
`833`	`833`	`struct pinctrl_gpio_range *range;`
`834`	`834`	`struct pinctrl_dev *pctldev;`
`@@ -848,7 +848,7 @@ void pinctrl_gpio_free_new(struct gpio_chip *gc, unsigned int offset)`
`848`	`848`
`849`	`849`	`mutex_unlock(&pctldev->mutex);`
`850`	`850`	`}`
`851`		`-EXPORT_SYMBOL_GPL(pinctrl_gpio_free_new);`
	`851`	`+EXPORT_SYMBOL_GPL(pinctrl_gpio_free);`
`852`	`852`
`853`	`853`	`static int pinctrl_gpio_direction(unsigned gpio, bool input)`
`854`	`854`	`{`
Original file line number	Diff line number	Diff line change
`@@ -211,7 +211,7 @@ static int npcmgpio_gpio_request(struct gpio_chip *chip, unsigned int offset)`
`211`	`211`	`static void npcmgpio_gpio_free(struct gpio_chip *chip, unsigned int offset)`
`212`	`212`	`{`
`213`	`213`	`dev_dbg(chip->parent, "gpio_free: offset%d\n", offset);`
`214`		`- pinctrl_gpio_free_new(chip, offset);`
	`214`	`+ pinctrl_gpio_free(chip, offset);`
`215`	`215`	`}`
`216`	`216`
`217`	`217`	`static void npcmgpio_irq_handler(struct irq_desc *desc)`
Original file line number	Diff line number	Diff line change
`@@ -207,7 +207,7 @@ static int npcmgpio_gpio_request(struct gpio_chip *chip, unsigned int offset)`
`207`	`207`
`208`	`208`	`static void npcmgpio_gpio_free(struct gpio_chip *chip, unsigned int offset)`
`209`	`209`	`{`
`210`		`- pinctrl_gpio_free_new(chip, offset);`
	`210`	`+ pinctrl_gpio_free(chip, offset);`
`211`	`211`	`}`
`212`	`212`
`213`	`213`	`static void npcmgpio_irq_handler(struct irq_desc *desc)`
Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,7 @@ static int gpio_pin_request(struct gpio_chip *gc, unsigned offset)`
`140`	`140`
`141`	`141`	`static void gpio_pin_free(struct gpio_chip *gc, unsigned offset)`
`142`	`142`	`{`
`143`		`- return pinctrl_gpio_free_new(gc, offset);`
	`143`	`+ return pinctrl_gpio_free(gc, offset);`
`144`	`144`	`}`
`145`	`145`
`146`	`146`	`static void gpio_pin_set_value(struct sh_pfc_chip *chip, unsigned offset,`