diff mbox

[PATCHv2] usb: ehci: unlink_empty_async_suspended() only used with CONFIG_PM

Message ID 1364321673-2030-1-git-send-email-linux@prisktech.co.nz (mailing list archive)
State New, archived
Headers show

Commit Message

Tony Prisk March 26, 2013, 6:14 p.m. UTC
Compiling with !CONFIG_PM generates an unused function warning on
unlink_empty_async_suspended().

Enclose the function in a #ifdef CONFIG_PM

Signed-off-by: Tony Prisk <linux@prisktech.co.nz>
---
Fixed up the commit message.
 drivers/usb/host/ehci-q.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Alan Stern March 26, 2013, 6:45 p.m. UTC | #1
On Wed, 27 Mar 2013, Tony Prisk wrote:

> Compiling with !CONFIG_PM generates an unused function warning on
> unlink_empty_async_suspended().
> 
> Enclose the function in a #ifdef CONFIG_PM
> 
> Signed-off-by: Tony Prisk <linux@prisktech.co.nz>
> ---
> Fixed up the commit message.
>  drivers/usb/host/ehci-q.c |    3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/usb/host/ehci-q.c b/drivers/usb/host/ehci-q.c
> index 23d1369..3638b28 100644
> --- a/drivers/usb/host/ehci-q.c
> +++ b/drivers/usb/host/ehci-q.c
> @@ -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 */

Acked-by: Alan Stern <stern@rowland.harvard.edu>

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

Patch

diff --git a/drivers/usb/host/ehci-q.c b/drivers/usb/host/ehci-q.c
index 23d1369..3638b28 100644
--- a/drivers/usb/host/ehci-q.c
+++ b/drivers/usb/host/ehci-q.c
@@ -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 */