Skip to contentSkip to conversation

USB: remove (unneeded proto) that causes a warning w/o CONFIG_PM

PATCH Applied Chris Wedgwood 2 participants 7 messages Oct 20, 2004 – Nov 4, 2004

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 USB: remove (unneeded proto) that causes a warning w/o CONFIG_PM

remove (unneeded proto) that causes a warning w/o CONFIG_PM

Signed-off-by [email protected]
drivers/usb/host/ohci-hcd.c +0 -1
diff -Nru a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c
@@ -140,7 +140,6 @@
 
 static void ohci_dump (struct ohci_hcd *ohci, int verbose);
 static int ohci_init (struct ohci_hcd *ohci);
-static int ohci_restart (struct ohci_hcd *ohci);
 static void ohci_stop (struct usb_hcd *hcd);
 
 #include "ohci-hub.c"
Applied
#1 lore raw
Quoted 3 lines · Chris Wedgwood

remove (unneeded proto) that causes a warning w/o CONFIG_PM

Signed-off-by [email protected]

Applied, thanks.

greg k-h

#2 lore raw
In reply to Chris Wedgwood
Quoted 8 lines · Chris Wedgwood

remove (unneeded proto) that causes a warning w/o CONFIG_PM

Signed-off-by [email protected]

diff -Nru a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c

drivers/usb/host/ohci-hcd.c line 145

Quoted 7 lines
drivers/usb/host/ohci-hcd.c +0 -1
@@ -140,7 +140,6 @@
 
 static void ohci_dump (struct ohci_hcd *ohci, int verbose);
 static int ohci_init (struct ohci_hcd *ohci);
-static int ohci_restart (struct ohci_hcd *ohci);
 static void ohci_stop (struct usb_hcd *hcd);
 
 #include "ohci-hub.c"

Wait, this patch causes problems if CONFIG_PM is enabled. Not applied.

thanks,

greg k-h

#3 lore raw
Quoted 1 line · Greg KH

Wait, this patch causes problems if CONFIG_PM is enabled. Not applied.

does it? the function is declared before it's called so it should be ok surely?

#4 lore raw
Quoted 6 lines · Chris Wedgwood
Quoted 1 line · Greg KH

Wait, this patch causes problems if CONFIG_PM is enabled. Not applied.

does it? the function is declared before it's called so it should be ok surely?

I get compiler warnings with your patch applied...

#5 lore raw

PATCH 1/1 USB: fix compile warning for USB w/oPM

Remove compile warning for USB w/o PM.

---

This one I even tested... sorry about before!

===== drivers/usb/host/ohci-hcd.c 1.76 vs edited =====

drivers/usb/host/ohci-hcd.c +0 -1
@@ -140,7 +140,6 @@ static const char	hcd_name [] = "ohci_hc
 
 static void ohci_dump (struct ohci_hcd *ohci, int verbose);
 static int ohci_init (struct ohci_hcd *ohci);
-static int ohci_restart (struct ohci_hcd *ohci);
 static void ohci_stop (struct usb_hcd *hcd);
 
 #include "ohci-hub.c"

===== drivers/usb/host/ohci-hub.c 1.29 vs edited =====

drivers/usb/host/ohci-hub.c +1 -0
@@ -41,6 +41,7 @@
 #define OHCI_SCHED_ENABLES \
 	(OHCI_CTRL_CLE|OHCI_CTRL_BLE|OHCI_CTRL_PLE|OHCI_CTRL_IE)
 
+static int ohci_restart (struct ohci_hcd *ohci);
 static void dl_done_list (struct ohci_hcd *, struct pt_regs *);
 static void finish_unlinks (struct ohci_hcd *, u16 , struct pt_regs *);
 
#6 lore raw

Re: [PATCH] USB: fix compile warning for USB w/oPM

Quoted 6 lines · Chris Wedgwood

Remove compile warning for USB w/o PM.

---

This one I even tested... sorry about before!

Already fixed in my tree from a patch from David Brownell.

thanks,

greg k-h