aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlan Stern <stern@rowland.harvard.edu>2016-02-04 11:17:36 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-02-04 14:27:11 -0500
commit1586ba0c218b10cce1de57c45f599dd8831a2d12 (patch)
tree4fb66ccaa51f3e3a4ad5648703819013c61d608d
parent379d3d33c83b667b0edad0110693567306463882 (diff)
USB: EHCI: fix compiler warning introduced by commit 2a40f324541e
Fix the following compiler warning (found by the kbuild test robot): drivers/usb/host/ehci-hcd.c:312:13: warning: 'unlink_empty_async_suspended' declared 'static' but never defined Commit 2a40f324541e ("USB: EHCI: fix regression during bus resume") protected the function definition with a "#ifdef CONFIG_PM" block, so now the declaration needs to be similarly protected. This patch moves it to a better location. Reported-by: kbuild test robot <fengguang.wu@intel.com> Signed-off-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/usb/host/ehci-hcd.c1
-rw-r--r--drivers/usb/host/ehci-hub.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
index a93d445b63a4..ae1b6e69eb96 100644
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
@@ -309,7 +309,6 @@ static void ehci_quiesce (struct ehci_hcd *ehci)
309static void end_iaa_cycle(struct ehci_hcd *ehci); 309static void end_iaa_cycle(struct ehci_hcd *ehci);
310static void end_unlink_async(struct ehci_hcd *ehci); 310static void end_unlink_async(struct ehci_hcd *ehci);
311static void unlink_empty_async(struct ehci_hcd *ehci); 311static void unlink_empty_async(struct ehci_hcd *ehci);
312static void unlink_empty_async_suspended(struct ehci_hcd *ehci);
313static void ehci_work(struct ehci_hcd *ehci); 312static void ehci_work(struct ehci_hcd *ehci);
314static void start_unlink_intr(struct ehci_hcd *ehci, struct ehci_qh *qh); 313static void start_unlink_intr(struct ehci_hcd *ehci, struct ehci_qh *qh);
315static void end_unlink_intr(struct ehci_hcd *ehci, struct ehci_qh *qh); 314static void end_unlink_intr(struct ehci_hcd *ehci, struct ehci_qh *qh);
diff --git a/drivers/usb/host/ehci-hub.c b/drivers/usb/host/ehci-hub.c
index 6333d3c2be9c..ffc90295a95f 100644
--- a/drivers/usb/host/ehci-hub.c
+++ b/drivers/usb/host/ehci-hub.c
@@ -33,6 +33,8 @@
33 33
34#ifdef CONFIG_PM 34#ifdef CONFIG_PM
35 35
36static void unlink_empty_async_suspended(struct ehci_hcd *ehci);
37
36static int persist_enabled_on_companion(struct usb_device *udev, void *unused) 38static int persist_enabled_on_companion(struct usb_device *udev, void *unused)
37{ 39{
38 return !udev->maxchild && udev->persist_enabled && 40 return !udev->maxchild && udev->persist_enabled &&