usb: ehci: unlink_empty_async_suspended() only used with CONFIG_PM
Subsystems (2)
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
@@ -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
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
@@ -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 */
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 withCONFIG_PM" tried to hide theunlink_empty_async_suspendedfunction 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
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 withCONFIG_PM" tried to hide theunlink_empty_async_suspendedfunction 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
Re: [PATCH] usb: ehci: mark unlink_empty_async_suspended() as __maybe_unused
In reply to Arnd BergmannQuoted 4 lines · Arnd Bergmann
Patch
4d053fdac3"usb: ehci:unlink_empty_async_suspended()only used withCONFIG_PM" tried to hide theunlink_empty_async_suspendedfunction 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.
Alan Stern
maintainerRe: [PATCH] usb: ehci: mark unlink_empty_async_suspended() as __maybe_unused
In reply to Tony PriskQuoted 7 lines · Tony Prisk
Quoted 6 lines · Arnd Bergmann
Quoted 3 lines · Arnd Bergmann
Patch
4d053fdac3"usb: ehci:unlink_empty_async_suspended()only used withCONFIG_PM" tried to hide theunlink_empty_async_suspendedfunction 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