Skip to contentSkip to conversation

usb: ehci: unlink_empty_async_suspended() only used with CONFIG_PM

PATCH Superseded Tony Prisk 2 participants 2 messages Mar 26, 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

---
Fixed up the commit message.

 drivers/usb/host/ehci-q.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/usb/host/ehci-q.c +2 -1
index 23d1369..3638b28 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,7 +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
maintainer Acked-by on v2 1/1
#1 lore raw
Quoted 24 lines · Tony Prisk

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

Enclose the function in a #ifdef CONFIG_PM

---
Fixed up the commit message.

 drivers/usb/host/ehci-q.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/usb/host/ehci-q.c +1 -0
index 23d1369..3638b28 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)
 {

drivers/usb/host/ehci-q.c static void unlink_empty_async_suspended(struct ehci_hcd *ehci) · line 1334

Quoted 7 lines
drivers/usb/host/ehci-q.c +1 -1
@@ -1328,7 +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 */

... except that the blank line before the comment in the hunk above should be retained, not removed.