diff mbox series

leds: fix ifdef check for gpio_led_register_device()

Message ID 20240228093834.2230004-1-arnd@kernel.org
State New
Headers
Series leds: fix ifdef check for gpio_led_register_device() |

Commit Message

Arnd Bergmann Feb. 28, 2024, 9:38 a.m. UTC 
  From: Arnd Bergmann <arnd@arndb.de>

gpio_led_register_device() is built whenever CONFIG_LEDS_GPIO_REGISTER is
enabled, and this may be used even when CONFIG_NEW_LEDS is turned off.

However, the stub declaration in the header is provided for all configs
without CONFIG_NEW_LEDS, resulting in a build failure:

drivers/leds/leds-gpio-register.c:24:1: error: redefinition of 'gpio_led_register_device'
   24 | gpio_led_register_device(int id, const struct gpio_led_platform_data *pdata)
      | ^
include/linux/leds.h:646:39: note: previous definition is here

Change the #ifdef check to match the definition.
Note: this apparently took years of randconfig builds to hit, since
a number of other drivers just 'select NEW_LEDS' anyway.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 include/linux/leds.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Lee Jones Feb. 29, 2024, 5:43 p.m. UTC | #1 
On Wed, 28 Feb 2024 10:38:26 +0100, Arnd Bergmann wrote:
> gpio_led_register_device() is built whenever CONFIG_LEDS_GPIO_REGISTER is
> enabled, and this may be used even when CONFIG_NEW_LEDS is turned off.
> 
> However, the stub declaration in the header is provided for all configs
> without CONFIG_NEW_LEDS, resulting in a build failure:
> 
> drivers/leds/leds-gpio-register.c:24:1: error: redefinition of 'gpio_led_register_device'
>    24 | gpio_led_register_device(int id, const struct gpio_led_platform_data *pdata)
>       | ^
> include/linux/leds.h:646:39: note: previous definition is here
> 
> [...]

Applied, thanks!

[1/1] leds: fix ifdef check for gpio_led_register_device()
      commit: 71c65d0ff79e3b21cb3eba67d87159533daaadbc

--
Lee Jones [李琼斯]
diff mbox series

Patch

diff --git a/include/linux/leds.h b/include/linux/leds.h
index 7598d472903a..db6b114bb3d9 100644
--- a/include/linux/leds.h
+++ b/include/linux/leds.h
@@ -639,7 +639,7 @@  struct gpio_led_platform_data {
 	gpio_blink_set_t	gpio_blink_set;
 };
 
-#ifdef CONFIG_NEW_LEDS
+#ifdef CONFIG_LEDS_GPIO_REGISTER
 struct platform_device *gpio_led_register_device(
 		int id, const struct gpio_led_platform_data *pdata);
 #else