[PATCH] USB: isp1362-hcd: Removes CONFIG_USB_OTG dependent code, fix build breakage

[PATCH] USB: isp1362-hcd: Removes CONFIG_USB_OTG dependent code, fix build breakage

[Javier Martinez Canillas]

In today linux-next I got a compile error on usb/host/isp1362-hcd:

drivers/usb/host/isp1362-hcd.c: In function ‘isp1362_hub_control’:
drivers/usb/host/isp1362-hcd.c:1680: error: ‘ohci’ undeclared (first use in this function)

The problem is when the CONFIG_USB_OTG option is enabled. 

ohci variable is never declared and there isn't any CONFIG_USB_OTG dependent code 
besides the portion defined in isp1362_hub_control. 

So I think that maybe USB OTG support is not needed/supported.

This patch removes the CONFIG_USB_OTG dependent block so the driver can compile cleanly.

Thanks a lot.

Signed-off-by: Javier Martinez Canillas <martinez.javier@gmail.com>
---
 drivers/usb/host/isp1362-hcd.c |    7 -------
 1 files changed, 0 insertions(+), 7 deletions(-)

diff --git a/drivers/usb/host/isp1362-hcd.c b/drivers/usb/host/isp1362-hcd.c
index 0587ad4..ae30440 100644
--- a/drivers/usb/host/isp1362-hcd.c
+++ b/drivers/usb/host/isp1362-hcd.c
@@ -1676,13 +1676,6 @@ static int isp1362_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
 		switch (wValue) {
 		case USB_PORT_FEAT_SUSPEND:
 			_DBG(0, "USB_PORT_FEAT_SUSPEND\n");
-#ifdef	CONFIG_USB_OTG
-			if (ohci->hcd.self.otg_port == (wIndex + 1) &&
-			    ohci->hcd.self.b_hnp_enable) {
-				start_hnp(ohci);
-				break;
-			}
-#endif
 			spin_lock_irqsave(&isp1362_hcd->lock, flags);
 			isp1362_write_reg32(isp1362_hcd, HCRHPORT1 + wIndex, RH_PS_PSS);
 			isp1362_hcd->rhport[wIndex] =
-- 
1.7.0.4

Re: [PATCH] USB: isp1362-hcd: Removes CONFIG_USB_OTG dependent code, fix build breakage

[Mike Frysinger]

On Thu, Sep 9, 2010 at 17:31, Javier Martinez Canillas wrote:
> In today linux-next I got a compile error on usb/host/isp1362-hcd:
>
> drivers/usb/host/isp1362-hcd.c: In function ‘isp1362_hub_control’:
> drivers/usb/host/isp1362-hcd.c:1680: error: ‘ohci’ undeclared (first use in this function)
>
> The problem is when the CONFIG_USB_OTG option is enabled.
>
> ohci variable is never declared and there isn't any CONFIG_USB_OTG dependent code
> besides the portion defined in isp1362_hub_control.
>
> So I think that maybe USB OTG support is not needed/supported.
>
> This patch removes the CONFIG_USB_OTG dependent block so the driver can compile cleanly.

i dont believe we've ever used OTG (or if our test board is even wired
up to support it), so this is fine by me.  let the guy who actually
uses OTG worry about it.  presumably no one has yet if it doesnt even
compile ...
-mike