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
--- a/drivers/usb/host/ohci-hcd.c 2004-10-19 17:48:05 -07:00
+++ b/drivers/usb/host/ohci-hcd.c 2004-10-19 17:48:05 -07:00
@@ -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"
On Tue, Oct 19, 2004 at 07:38:03PM -0700, Chris Wedgwood wrote:
> 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
> --- a/drivers/usb/host/ohci-hcd.c 2004-10-19 17:48:05 -07:00
> +++ b/drivers/usb/host/ohci-hcd.c 2004-10-19 17:48:05 -07:00
> @@ -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
On Tue, Oct 19, 2004 at 07:38:03PM -0700, Chris Wedgwood wrote:
> remove (unneeded proto) that causes a warning w/o CONFIG_PM
>
> Signed-off-by: [email protected]
Applied, thanks.
greg k-h
On Wed, Oct 20, 2004 at 04:50:56PM -0700, Greg KH wrote:
> 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?
On Wed, Oct 20, 2004 at 05:29:35PM -0700, Chris Wedgwood wrote:
> On Wed, Oct 20, 2004 at 04:50:56PM -0700, Greg KH wrote:
>
> > 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...
Remove compile warning for USB w/o PM.
Signed-off-by: Chris Wedgwood <[email protected]>
---
This one I even tested... sorry about before!
===== drivers/usb/host/ohci-hcd.c 1.76 vs edited =====
--- 1.76/drivers/usb/host/ohci-hcd.c 2004-10-12 06:24:03 -07:00
+++ edited/drivers/usb/host/ohci-hcd.c 2004-11-02 11:32:44 -08:00
@@ -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 =====
--- 1.29/drivers/usb/host/ohci-hub.c 2004-10-06 14:35:08 -07:00
+++ edited/drivers/usb/host/ohci-hub.c 2004-11-02 11:32:44 -08:00
@@ -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 *);
On Wed, Nov 03, 2004 at 01:10:49AM -0800, Chris Wedgwood wrote:
> Remove compile warning for USB w/o PM.
>
> Signed-off-by: Chris Wedgwood <[email protected]>
> ---
>
> This one I even tested... sorry about before!
Already fixed in my tree from a patch from David Brownell.
thanks,
greg k-h