Skip to contentSkip to conversation

gpio: Remove unused and obsoleted irq_to_gpio()

PATCH Applied Andy Shevchenko 5 participants 5 messages Jan 12, 2023 – Jan 16, 2023

Subsystems (6)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 gpio: Remove unused and obsoleted irq_to_gpio()

irq_to_gpio() is legacy and unused API, remove it for good.

This leaves gpio_to_irq() as it's used yet in many places. Nevertheless, removal of its counterpart is a good signal to whoever even trying to consider using them that do not.

---
 Documentation/driver-api/gpio/legacy.rst             |  8 --------
 .../translations/zh_CN/driver-api/gpio/legacy.rst    |  7 -------
 Documentation/translations/zh_TW/gpio.txt            |  7 -------
 arch/m68k/include/asm/gpio.h                         |  7 -------
 arch/sh/include/asm/gpio.h                           |  5 -----
 include/linux/gpio.h                                 | 12 ------------
 6 files changed, 46 deletions(-)
Documentation/driver-api/gpio/legacy.rst +0 -8
index e3e9d26a60ce..a0559d93efd1 100644
@@ -387,9 +387,6 @@ map between them using calls like::
 	/* map GPIO numbers to IRQ numbers */
 	int gpio_to_irq(unsigned gpio);
 
-	/* map IRQ numbers to GPIO numbers (avoid using this) */
-	int irq_to_gpio(unsigned irq);
-
 Those return either the corresponding number in the other namespace, or
 else a negative errno code if the mapping can't be done.  (For example,
 some GPIOs can't be used as IRQs.)  It is an unchecked error to use a GPIO
@@ -405,11 +402,6 @@ devices, by the board-specific initialization code.  Note that IRQ trigger
 options are part of the IRQ interface, e.g. IRQF_TRIGGER_FALLING, as are
 system wakeup capabilities.
 
-Non-error values returned from irq_to_gpio() would most commonly be used
-with gpio_get_value(), for example to initialize or update driver state
-when the IRQ is edge-triggered.  Note that some platforms don't support
-this reverse mapping, so you should avoid using it.
-
 
 Emulating Open Drain Signals
 ----------------------------
Documentation/translations/zh_CN/driver-api/gpio/legacy.rst +0 -7
index 8599e253fcc5..74fa473bb504 100644
@@ -358,9 +358,6 @@ GPIO 编号是无符号整数;IRQ 编号也是。这些构成了两个逻辑上
 	/* 映射 GPIO 编号到 IRQ 编号 */
 	int gpio_to_irq(unsigned gpio);
 
-	/* 映射 IRQ 编号到 GPIO 编号 (尽量避免使用) */
-	int irq_to_gpio(unsigned irq);
-
 它们的返回值为对应命名空间的相关编号,或是负的错误代码(如果无法映射)。
 (例如,某些 GPIO 无法做为 IRQ 使用。)以下的编号错误是未经检测的:使用一个
 未通过 gpio_direction_input()配置为输入的 GPIO 编号,或者使用一个
@@ -373,10 +370,6 @@ gpio_to_irq()返回的非错误值可以传递给 request_irq()或者 free_irq()
 触发选项是 IRQ 接口的一部分,如 IRQF_TRIGGER_FALLING,系统唤醒能力
 也是如此。
 
-irq_to_gpio()返回的非错误值大多数通常可以被 gpio_get_value()所使用,
-比如在 IRQ 是沿触发时初始化或更新驱动状态。注意某些平台不支持反映射,所以
-你应该尽量避免使用它。
-
 
 模拟开漏信号
 ------------
Documentation/translations/zh_TW/gpio.txt +0 -7
index abd8e4c0973e..1b986bbb0909 100644
@@ -363,9 +363,6 @@ GPIO 編號是無符號整數;IRQ 編號也是。這些構成了兩個邏輯上
 	/* 映射 GPIO 編號到 IRQ 編號 */
 	int gpio_to_irq(unsigned gpio);
 
-	/* 映射 IRQ 編號到 GPIO 編號 (儘量避免使用) */
-	int irq_to_gpio(unsigned irq);
-
 它們的返回值爲對應命名空間的相關編號,或是負的錯誤代碼(如果無法映射)。
 (例如,某些 GPIO 無法做爲 IRQ 使用。)以下的編號錯誤是未經檢測的:使用一個
 未通過 gpio_direction_input()配置爲輸入的 GPIO 編號,或者使用一個
@@ -378,10 +375,6 @@ gpio_to_irq()返回的非錯誤值可以傳遞給 request_irq()或者 free_irq()
 觸發選項是 IRQ 接口的一部分,如 IRQF_TRIGGER_FALLING,系統喚醒能力
 也是如此。
 
-irq_to_gpio()返回的非錯誤值大多數通常可以被 gpio_get_value()所使用,
-比如在 IRQ 是沿觸發時初始化或更新驅動狀態。注意某些平台不支持反映射,所以
-你應該儘量避免使用它。
-
 
 模擬開漏信號
 ----------------------------
arch/m68k/include/asm/gpio.h +0 -7
index a50b27719a58..5cfc0996ba94 100644
@@ -66,13 +66,6 @@ static inline int gpio_to_irq(unsigned gpio)
 		return __gpio_to_irq(gpio);
 }
 
-static inline int irq_to_gpio(unsigned irq)
-{
-	return (irq >= MCFGPIO_IRQ_VECBASE &&
-		irq < (MCFGPIO_IRQ_VECBASE + MCFGPIO_IRQ_MAX)) ?
-		irq - MCFGPIO_IRQ_VECBASE : -ENXIO;
-}
-
 static inline int gpio_cansleep(unsigned gpio)
 {
 	return gpio < MCFGPIO_PIN_MAX ? 0 : __gpio_cansleep(gpio);
arch/sh/include/asm/gpio.h +0 -5
index d643250f0a0f..588c1380e4cb 100644
@@ -40,11 +40,6 @@ static inline int gpio_to_irq(unsigned gpio)
 	return __gpio_to_irq(gpio);
 }
 
-static inline int irq_to_gpio(unsigned int irq)
-{
-	return -ENOSYS;
-}
-
 #endif /* CONFIG_GPIOLIB */
 
 #endif /* __ASM_SH_GPIO_H */
include/linux/gpio.h +0 -12
index e94815b3ce1d..85beb236c925 100644
@@ -81,11 +81,6 @@ static inline int gpio_to_irq(unsigned int gpio)
 	return __gpio_to_irq(gpio);
 }
 
-static inline int irq_to_gpio(unsigned int irq)
-{
-	return -EINVAL;
-}
-
 #endif /* ! CONFIG_ARCH_HAVE_CUSTOM_GPIO_H */
 
 /* CONFIG_GPIOLIB: bindings for managed devices that want to request gpios */
@@ -210,13 +205,6 @@ static inline int gpio_to_irq(unsigned gpio)
 	return -EINVAL;
 }
 
-static inline int irq_to_gpio(unsigned irq)
-{
-	/* irq can never have been returned from gpio_to_irq() */
-	WARN_ON(1);
-	return -EINVAL;
-}
-
 static inline int devm_gpio_request(struct device *dev, unsigned gpio,
 				    const char *label)
 {
Signature · 1 line
2.39.0
maintainer Acked-by on v1 1/1
#1 lore raw

CC greg

Quoted 15 lines · Andy Shevchenko

irq_to_gpio() is legacy and unused API, remove it for good.

This leaves gpio_to_irq() as it's used yet in many places. Nevertheless, removal of its counterpart is a good signal to whoever even trying to consider using them that do not.

---
 Documentation/driver-api/gpio/legacy.rst             |  8 --------
 .../translations/zh_CN/driver-api/gpio/legacy.rst    |  7 -------
 Documentation/translations/zh_TW/gpio.txt            |  7 -------
 arch/m68k/include/asm/gpio.h                         |  7 -------
 arch/sh/include/asm/gpio.h                           |  5 -----
 include/linux/gpio.h                                 | 12 ------------
 6 files changed, 46 deletions(-)

[...]

Quoted 6 lines
arch/m68k/include/asm/gpio.h +0 -0
@@ -66,13 +66,6 @@ static inline int gpio_to_irq(unsigned gpio)
                return __gpio_to_irq(gpio);
 }
 

arch/m68k/include/asm/gpio.h static inline int gpio_to_irq(unsigned gpio) · line 71

Quoted 10 lines
arch/m68k/include/asm/gpio.h +0 -7
-static inline int irq_to_gpio(unsigned irq)
-{
-       return (irq >= MCFGPIO_IRQ_VECBASE &&
-               irq < (MCFGPIO_IRQ_VECBASE + MCFGPIO_IRQ_MAX)) ?
-               irq - MCFGPIO_IRQ_VECBASE : -ENXIO;
-}
-
 static inline int gpio_cansleep(unsigned gpio)
 {
        return gpio < MCFGPIO_PIN_MAX ? 0 : __gpio_cansleep(gpio);

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds

Acked-by
#2 lore raw
Quoted 28 lines · Geert Uytterhoeven

CC greg

Quoted 15 lines · Andy Shevchenko

irq_to_gpio() is legacy and unused API, remove it for good.

This leaves gpio_to_irq() as it's used yet in many places. Nevertheless, removal of its counterpart is a good signal to whoever even trying to consider using them that do not.

---
  Documentation/driver-api/gpio/legacy.rst             |  8 --------
  .../translations/zh_CN/driver-api/gpio/legacy.rst    |  7 -------
  Documentation/translations/zh_TW/gpio.txt            |  7 -------
  arch/m68k/include/asm/gpio.h                         |  7 -------
  arch/sh/include/asm/gpio.h                           |  5 -----
  include/linux/gpio.h                                 | 12 ------------
  6 files changed, 46 deletions(-)

[...]

Quoted 6 lines
arch/m68k/include/asm/gpio.h +0 -0
@@ -66,13 +66,6 @@ static inline int gpio_to_irq(unsigned gpio)
                 return __gpio_to_irq(gpio);
  }
 
Quoted 12 lines

arch/m68k/include/asm/gpio.h static inline int gpio_to_irq(unsigned gpio) · line 71

Quoted 10 lines
arch/m68k/include/asm/gpio.h +0 -7
-static inline int irq_to_gpio(unsigned irq)
-{
-       return (irq >= MCFGPIO_IRQ_VECBASE &&
-               irq < (MCFGPIO_IRQ_VECBASE + MCFGPIO_IRQ_MAX)) ?
-               irq - MCFGPIO_IRQ_VECBASE : -ENXIO;
-}
-
  static inline int gpio_cansleep(unsigned gpio)
  {
         return gpio < MCFGPIO_PIN_MAX ? 0 : __gpio_cansleep(gpio);
Quoted 10 lines

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds

Reviewed-by on v1 1/1
#4 lore raw
In reply to Andy Shevchenko
Quoted 7 lines · Andy Shevchenko

irq_to_gpio() is legacy and unused API, remove it for good.

This leaves gpio_to_irq() as it's used yet in many places. Nevertheless, removal of its counterpart is a good signal to whoever even trying to consider using them that do not.

Thanks for killing off this API.

Yours,
Linus Walleij