linux-kernel - [PATCH v2] leds: fix redundant trigger API #ifdef

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-prev] [thread-next>] [day] [month] [year] [list]

Date:	Thu,  9 Apr 2015 17:37:45 +0200
From:	Valentin Rothberg <valentinrothberg@...il.com>
To:	j.anaszewski@...sung.com, cooloney@...il.com, rpurdie@...ys.net,
	linux-leds@...r.kernel.org, linux-kernel@...r.kernel.org,
	pebolle@...cali.nl, rupran@...server.de, stefan.hengelein@....de
Cc:	Valentin Rothberg <valentinrothberg@...il.com>
Subject: [PATCH v2] leds: fix redundant trigger API #ifdef

Commit 5a15d172057c ("leds: unify the location of led-trigger API")
moved the leds trigger API to led.h.  Moving the function definitions
caused a logical problem regarding the visibility of #idef blocks.  As
listed in the code snippet below, the inner #else block will never see a
compiler since CONFIG_LEDS_TRIGGERS is always true for the second #ifdef.

 #ifdef CONFIG_LEDS_TRIGGERS
 [...]
 #ifdef CONFIG_LEDS_TRIGGERS
 [...]
 #else
 #define led_trigger_set_default(x) do {} while (0)
 #define led_trigger_set(x, y) do {} while (0)
 #define led_trigger_remove(x) do {} while (0)
 #define led_get_trigger_data(x) (NULL)
 #endif
 #else
 [...]
 #endif

This patch removes the second, redundant #ifdef and moves the code of
the #else branch to its proper place.

Signed-off-by: Valentin Rothberg <valentinrothberg@...il.com>
---
I found this issue with undertaker-checkpatch from the Undertaker
toolsuite.  See undertaker.cs.fau.de for more information.

v2:  Add the code snippet example.  It has been removed by Git before.
---
 include/linux/leds.h | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/include/linux/leds.h b/include/linux/leds.h
index 057970818961..96a669f93f69 100644
--- a/include/linux/leds.h
+++ b/include/linux/leds.h
@@ -223,7 +223,6 @@ struct led_trigger {
 	struct list_head  next_trig;
 };
 
-#ifdef CONFIG_LEDS_TRIGGERS
 void led_trigger_set_default(struct led_classdev *led_cdev);
 void led_trigger_set(struct led_classdev *led_cdev,
 			struct led_trigger *trigger);
@@ -234,13 +233,6 @@ static inline void *led_get_trigger_data(struct led_classdev *led_cdev)
 	return led_cdev->trigger_data;
 }
 
-#else
-#define led_trigger_set_default(x) do {} while (0)
-#define led_trigger_set(x, y) do {} while (0)
-#define led_trigger_remove(x) do {} while (0)
-#define led_get_trigger_data(x) (NULL)
-#endif
-
 ssize_t led_trigger_store(struct device *dev, struct device_attribute *attr,
 			const char *buf, size_t count);
 ssize_t led_trigger_show(struct device *dev, struct device_attribute *attr,
@@ -282,6 +274,11 @@ extern void led_trigger_rename_static(const char *name,
 
 #else
 
+#define led_trigger_set_default(x) do {} while (0)
+#define led_trigger_set(x, y) do {} while (0)
+#define led_trigger_remove(x) do {} while (0)
+#define led_get_trigger_data(x) (NULL)
+
 /* Trigger has no members */
 struct led_trigger {};
 
-- 
2.1.0

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/