Skip to contentSkip to conversation

usb: ehci: unlink_empty_async_suspended() only used with CONFIG_PM

PATCH New Tony Prisk 3 participants 6 messages Mar 27, 2013 – Mar 29, 2013

Subsystems (2)
lore
Share & tools
lore

Tony Prisk

author
#0 lore raw

PATCH v2 1/1 usb: ehci: unlink_empty_async_suspended() only used with CONFIG_PM

Compiling with !CONFIG_PM generates an unused function warning on unlink_empty_async_suspended().

Enclose the function in a #ifdef CONFIG_PM

---
v2:
Tidy up blank line as requested by Alan Stern

 drivers/usb/host/ehci-q.c |    2 ++
 1 file changed, 2 insertions(+)
drivers/usb/host/ehci-q.c +2 -0
index 23d1369..1ea4de1 100644
@@ -1316,6 +1316,7 @@ static void unlink_empty_async(struct ehci_hcd *ehci)
 	}
 }
 
+#ifdef CONFIG_PM
 /* The root hub is suspended; unlink all the async QHs */
 static void unlink_empty_async_suspended(struct ehci_hcd *ehci)
 {
@@ -1328,6 +1329,7 @@ static void unlink_empty_async_suspended(struct ehci_hcd *ehci)
 	}
 	start_iaa_cycle(ehci, false);
 }
+#endif
 
 /* makes sure the async qh will become idle */
 /* caller must own ehci->lock */
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH 1/1 usb: ehci: mark unlink_empty_async_suspended() as __maybe_unused

Patch 4d053fdac3 "usb: ehci: unlink_empty_async_suspended() only used with CONFIG_PM" tried to hide the unlink_empty_async_suspended function inside of an #ifdef to work around an unused function warning.

Unfortunately that had the effect of introducing a new warning:

drivers/usb/host/ehci-q.c:1297:13: warning: 'unlink_empty_async_suspended'
declared 'static' but never defined [-Wunused-function]

While we could add another #ifdef around the function declaration to avoid this, a nicer solution is to mark it as __maybe_unused, which will let gcc silently drop the function definition when it is not needed.

---

drivers/usb/host/ehci-q.c +1 -3
index 7562d76..d34b399 100644
@@ -1293,9 +1293,8 @@ static void unlink_empty_async(struct ehci_hcd *ehci)
 	}
 }
 
-#ifdef CONFIG_PM
 /* The root hub is suspended; unlink all the async QHs */
-static void unlink_empty_async_suspended(struct ehci_hcd *ehci)
+static void __maybe_unused unlink_empty_async_suspended(struct ehci_hcd *ehci)
 {
 	struct ehci_qh		*qh;
 
@@ -1306,7 +1305,6 @@ static void unlink_empty_async_suspended(struct ehci_hcd *ehci)
 	}
 	start_iaa_cycle(ehci);
 }
-#endif
 
 /* makes sure the async qh will become idle */
 /* caller must own ehci->lock */
#2 lore raw

Re: [PATCH] usb: ehci: mark unlink_empty_async_suspended() as __maybe_unused

Quoted 3 lines · Arnd Bergmann

Patch 4d053fdac3 "usb: ehci: unlink_empty_async_suspended() only used with CONFIG_PM" tried to hide the unlink_empty_async_suspended function inside of an #ifdef to work around an unused function warning.

Hi Greg,

Apparently the warning is now also in 3.8.5, so you might want to backport this fix as well after you send it upstream.

Arnd

author
#3 lore raw

Re: [PATCH] usb: ehci: mark unlink_empty_async_suspended() as __maybe_unused

Quoted 10 lines · Arnd Bergmann
Quoted 3 lines · Arnd Bergmann

Patch 4d053fdac3 "usb: ehci: unlink_empty_async_suspended() only used with CONFIG_PM" tried to hide the unlink_empty_async_suspended function inside of an #ifdef to work around an unused function warning.

Hi Greg,

Apparently the warning is now also in 3.8.5, so you might want to backport this fix as well after you send it upstream.

Arnd

Grr, my bad - I originally wrote the patch with the forward decl #ifdef'd as well, but Alan pointed out that it didn't need to be. I thought I recompiled it after the change, but obviously not.

Thanks Arnd,

Regards
Tony P

maintainer
#4 lore raw

Re: [PATCH] usb: ehci: mark unlink_empty_async_suspended() as __maybe_unused

Quoted 7 lines · Tony Prisk
Quoted 6 lines · Arnd Bergmann
Quoted 3 lines · Arnd Bergmann

Patch 4d053fdac3 "usb: ehci: unlink_empty_async_suspended() only used with CONFIG_PM" tried to hide the unlink_empty_async_suspended function inside of an #ifdef to work around an unused function warning.

Hi Greg,

Quoted 7 lines
Quoted 4 lines

Apparently the warning is now also in 3.8.5, so you might want to backport this fix as well after you send it upstream.

Arnd

Grr, my bad - I originally wrote the patch with the forward decl #ifdef'd as well, but Alan pointed out that it didn't need to be. I thought I recompiled it after the change, but obviously not.

It's my fault too. I didn't realize the compiler would issue a warning about a static declaration with no definition.

Alan Stern

maintainer Acked-by on v1 1/1
#5 lore raw

Re: [PATCH] usb: ehci: mark unlink_empty_async_suspended() as __maybe_unused

In reply to Arnd Bergmann
Quoted 4 lines · Arnd Bergmann

Patch 4d053fdac3 "usb: ehci: unlink_empty_async_suspended() only used with CONFIG_PM" tried to hide the unlink_empty_async_suspended function inside of an #ifdef to work around an unused function warning.

Quoted 8 lines

Unfortunately that had the effect of introducing a new warning:

drivers/usb/host/ehci-q.c:1297:13: warning: 'unlink_empty_async_suspended'
declared 'static' but never defined [-Wunused-function]

While we could add another #ifdef around the function declaration to avoid this, a nicer solution is to mark it as __maybe_unused, which will let gcc silently drop the function definition when it is not needed.

IMO the compiler is being stupid. -Wunused-function should warn about functions that are defined but not called, not about functions that are declared but not defined. Grumble...

Anyway yes, this is a good fix.