Commit da6fb570 authored by David Brownell's avatar David Brownell Committed by Greg Kroah-Hartman

USB: remove new OHCI build warnings

Remove various newly-introduced compiler warnings for OHCI.
Signed-off-by: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 51745281
...@@ -80,7 +80,10 @@ static const char hcd_name [] = "ohci_hcd"; ...@@ -80,7 +80,10 @@ static const char hcd_name [] = "ohci_hcd";
static void ohci_dump (struct ohci_hcd *ohci, int verbose); static void ohci_dump (struct ohci_hcd *ohci, int verbose);
static int ohci_init (struct ohci_hcd *ohci); static int ohci_init (struct ohci_hcd *ohci);
static void ohci_stop (struct usb_hcd *hcd); static void ohci_stop (struct usb_hcd *hcd);
#if defined(CONFIG_PM) || defined(CONFIG_PCI)
static int ohci_restart (struct ohci_hcd *ohci); static int ohci_restart (struct ohci_hcd *ohci);
#endif
#include "ohci-hub.c" #include "ohci-hub.c"
#include "ohci-dbg.c" #include "ohci-dbg.c"
...@@ -396,7 +399,7 @@ static int check_ed(struct ohci_hcd *ohci, struct ed *ed) ...@@ -396,7 +399,7 @@ static int check_ed(struct ohci_hcd *ohci, struct ed *ed)
*/ */
static void unlink_watchdog_func(unsigned long _ohci) static void unlink_watchdog_func(unsigned long _ohci)
{ {
long flags; unsigned long flags;
unsigned max; unsigned max;
unsigned seen_count = 0; unsigned seen_count = 0;
unsigned i; unsigned i;
...@@ -893,6 +896,8 @@ static void ohci_stop (struct usb_hcd *hcd) ...@@ -893,6 +896,8 @@ static void ohci_stop (struct usb_hcd *hcd)
/*-------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------*/
#if defined(CONFIG_PM) || defined(CONFIG_PCI)
/* must not be called from interrupt context */ /* must not be called from interrupt context */
static int ohci_restart (struct ohci_hcd *ohci) static int ohci_restart (struct ohci_hcd *ohci)
{ {
...@@ -954,6 +959,8 @@ static int ohci_restart (struct ohci_hcd *ohci) ...@@ -954,6 +959,8 @@ static int ohci_restart (struct ohci_hcd *ohci)
return 0; return 0;
} }
#endif
/*-------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------*/
#define DRIVER_INFO DRIVER_VERSION " " DRIVER_DESC #define DRIVER_INFO DRIVER_VERSION " " DRIVER_DESC
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment