Skip to content

Commit da6fb57

Browse files
David Brownellgregkh
authored andcommitted
USB: remove new OHCI build warnings
Remove various newly-introduced compiler warnings for OHCI. Signed-off-by: David Brownell <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 5174528 commit da6fb57

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

drivers/usb/host/ohci-hcd.c

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,10 @@ static const char hcd_name [] = "ohci_hcd";
8080
static void ohci_dump (struct ohci_hcd *ohci, int verbose);
8181
static int ohci_init (struct ohci_hcd *ohci);
8282
static void ohci_stop (struct usb_hcd *hcd);
83+
84+
#if defined(CONFIG_PM) || defined(CONFIG_PCI)
8385
static int ohci_restart (struct ohci_hcd *ohci);
86+
#endif
8487

8588
#include "ohci-hub.c"
8689
#include "ohci-dbg.c"
@@ -396,7 +399,7 @@ static int check_ed(struct ohci_hcd *ohci, struct ed *ed)
396399
*/
397400
static void unlink_watchdog_func(unsigned long _ohci)
398401
{
399-
long flags;
402+
unsigned long flags;
400403
unsigned max;
401404
unsigned seen_count = 0;
402405
unsigned i;
@@ -893,6 +896,8 @@ static void ohci_stop (struct usb_hcd *hcd)
893896

894897
/*-------------------------------------------------------------------------*/
895898

899+
#if defined(CONFIG_PM) || defined(CONFIG_PCI)
900+
896901
/* must not be called from interrupt context */
897902
static int ohci_restart (struct ohci_hcd *ohci)
898903
{
@@ -954,6 +959,8 @@ static int ohci_restart (struct ohci_hcd *ohci)
954959
return 0;
955960
}
956961

962+
#endif
963+
957964
/*-------------------------------------------------------------------------*/
958965

959966
#define DRIVER_INFO DRIVER_VERSION " " DRIVER_DESC

0 commit comments

Comments
 (0)