linux-kernel - [PATCH] leds: fix ifdef check for gpio_led_register

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20240228093834.2230004-1-arnd@kernel.org>
Date: Wed, 28 Feb 2024 10:38:26 +0100
From: Arnd Bergmann <arnd@...nel.org>
To: Pavel Machek <pavel@....cz>,
	Lee Jones <lee@...nel.org>
Cc: Arnd Bergmann <arnd@...db.de>,
	Andrew Lunn <andrew@...n.ch>,
	Christian Marangi <ansuelsmth@...il.com>,
	"David S. Miller" <davem@...emloft.net>,
	Jacek Anaszewski <jacek.anaszewski@...il.com>,
	Hans de Goede <hdegoede@...hat.com>,
	Jean-Jacques Hiblot <jjhiblot@...phandler.com>,
	Heiner Kallweit <hkallweit1@...il.com>,
	linux-leds@...r.kernel.org,
	linux-kernel@...r.kernel.org
Subject: [PATCH] leds: fix ifdef check for gpio_led_register_device()

From: Arnd Bergmann <arnd@...db.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@...db.de>
---
 include/linux/leds.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
-- 
2.39.2