[PATCH] Fix for error: invalid storage class for function '__usb_port_suspend'

[PATCH] Fix for error: invalid storage class for function '__usb_port_suspend'

[Khem Raj]

Hi

Compiling kernel for OMAP1610 with GCC 4.2 I stumbled over this error.

drivers/usb/core/hub.c: In function 'usb_new_device':
drivers/usb/core/hub.c:1293: error: invalid storage class for  
function '__usb_port_suspend'
drivers/usb/core/hub.c:1294: warning: implicit declaration of  
function '__usb_port_suspend'
drivers/usb/core/hub.c: At top level:
drivers/usb/core/hub.c:1567: error: static declaration of  
'__usb_port_suspend' follows non-static declaration
drivers/usb/core/hub.c:1294: error: previous implicit declaration of  
'__usb_port_suspend' was here
make[3]: *** [drivers/usb/core/hub.o] Error 1
make[2]: *** [drivers/usb/core] Error 2
make[1]: *** [drivers/usb] Error 2
make: *** [drivers] Error 2


GCC does not like the forward declaration of the function inside the  
function. Attached patch moves the declaration outside the function  
and because the call is inside the code in CONFIG_USB_OTG I moved the  
declaration also under same conditional.

I am able to build and and boot the kernel on OMAP1610 with this patch.

OK?


Khem Raj <kraj@mvista.com>
MontaVista Software Inc.

Signed-off-by: Khem Raj <kraj@mvista.com>

diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index 66bff18..ba165af 100644
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -1188,6 +1188,7 @@ #endif
#ifdef CONFIG_USB_OTG
#include "otg_whitelist.h"
+static int __usb_port_suspend(struct usb_device *, int port1);
#endif
/**
@@ -1289,8 +1290,6 @@ #ifdef    CONFIG_USB_OTG
                  * (Includes HNP test device.)
                  */
                 if (udev->bus->b_hnp_enable || udev->bus->is_b_host) {
-                       static int __usb_port_suspend(struct  
usb_device *,
-                                               int port1);
                         err = __usb_port_suspend(udev, udev->bus- 
 >otg_port);
                         if (err < 0)
                                 dev_dbg(&udev->dev, "HNP fail, %d 
\n", err);

Re: [PATCH] Fix for error: invalid storage class for function '__usb_port_suspend'

[David Brownell]

This is already fixed in the upstream tree (RC5) ...

Re: [PATCH] Fix for error: invalid storage class for function '__usb_port_suspend'

[Tony Lindgren]

* David Brownell <david-b@pacbell.net> [061110 04:52]:
> This is already fixed in the upstream tree (RC5) ...

I just updated it to rc5.

Tony