[PATCH mac80211-next] rfkill: hide unused goto label

Subsystems: rfkill, the rest

STALE3555d

2 messages, 2 authors, 2016-12-16 · open the first message on its own page

[PATCH mac80211-next] rfkill: hide unused goto label

From: Arnd Bergmann <arnd@arndb.de>
Date: 2016-12-16 08:44:57

A cleanup introduced a harmless warning in some configurations:

net/rfkill/core.c: In function 'rfkill_init':
net/rfkill/core.c:1350:1: warning: label 'error_input' defined but not used [-Wunused-label]

This adds another #ifdef around the label to match that around the
caller.

Fixes: 6124c53edeea ("rfkill: Cleanup error handling in rfkill_init()")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 net/rfkill/core.c | 2 ++
 1 file changed, 2 insertions(+)
diff --git a/net/rfkill/core.c b/net/rfkill/core.c
index f6b01f3616e5..b7adaee69756 100644
--- a/net/rfkill/core.c
+++ b/net/rfkill/core.c
@@ -1347,8 +1347,10 @@ static int __init rfkill_init(void)
 
 	return 0;
 
+#ifdef CONFIG_RFKILL_INPUT
 error_input:
 	rfkill_any_led_trigger_unregister();
+#endif
 error_led_trigger:
 	misc_deregister(&rfkill_miscdev);
 error_misc:
-- 
2.9.0

Re: [PATCH mac80211-next] rfkill: hide unused goto label

From: Johannes Berg <johannes@sipsolutions.net>
Date: 2016-12-16 09:07:51

On Fri, 2016-12-16 at 09:44 +0100, Arnd Bergmann wrote:
A cleanup introduced a harmless warning in some configurations:

net/rfkill/core.c: In function 'rfkill_init':
net/rfkill/core.c:1350:1: warning: label 'error_input' defined but
not used [-Wunused-label]

This adds another #ifdef around the label to match that around the
caller.
Applied, thanks.

johannes
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help