usb_otg: compile fix

From: Francisco Alecrim <[email protected]>

include/linux/usb.h: In function 'usb_mark_last_busy':
include/linux/usb.h:561: error: 'struct usb_device' has no member named 'last_busy'

Option USB_OTG selects USB_SUSPEND but doesn't select PM(required by USB_SUSPEND) causing this compile error. Putting USB_SUSPEND as USB_OTG depend ensure that PM is selected.

---
 drivers/usb/core/Kconfig   |    1 -
 drivers/usb/gadget/Kconfig |    2 +-
 2 files changed, 1 insertions(+), 2 deletions(-)

index ad92594..4c7d6e8 100644
@@ -109,7 +109,6 @@ config USB_SUSPEND
 config USB_OTG
 	bool
 	depends on USB && EXPERIMENTAL
-	select USB_SUSPEND
 	default n
 
 

index ee41120..af819fe 100644
@@ -211,7 +211,7 @@ config USB_OMAP
 
 config USB_OTG
 	boolean "OTG Support"
-	depends on USB_GADGET_OMAP && ARCH_OMAP_OTG && USB_OHCI_HCD
+	depends on USB_GADGET_OMAP && ARCH_OMAP_OTG && USB_OHCI_HCD && USB_SUSPEND
 	help
 	   The most notable feature of USB OTG is support for a
 	   "Dual-Role" device, which can act as either a device

1.6.3.3

From: Francisco Alecrim <[email protected]>

drivers/cbus/tahvo-usb.c:138: undefined reference to 'usb_bus_start_enum'

usb_bus_start_enum only exported if USB_OTG enabled

---
 drivers/cbus/tahvo-usb.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

index 9f8bbcc..762671a 100644
@@ -132,12 +132,14 @@ static irqreturn_t omap_otg_irq(int irq, void *arg)
 	} else if (otg_irq & A_VBUS_ERR) {
 		omap_writew(A_VBUS_ERR, OTG_IRQ_SRC);
 	} else if (otg_irq & DRIVER_SWITCH) {
+#ifdef CONFIG_USB_OTG
 		if ((!(omap_readl(OTG_CTRL) & OTG_DRIVER_SEL)) &&
 		   tu->otg.host && tu->otg.state == OTG_STATE_A_HOST) {
 			/* role is host */
 			usb_bus_start_enum(tu->otg.host,
 					   tu->otg.host->otg_port);
 		}
+#endif
 		omap_writew(DRIVER_SWITCH, OTG_IRQ_SRC);
 	} else
 		return IRQ_NONE;

1.6.3.3

--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

This patch has been applied to the linux-omap
by youw fwiendly patch wobot.

Branch in linux-omap: cbus

Initial commit ID (Likely to change): df01abf99660f3077315a1f69a462a8e46bacccb

PatchWorks
http://patchwork.kernel.org/patch/71704/

Git (Likely to change, and takes a while to get mirrored)
http://git.kernel.org/?p=linux/kernel/git/tmlind/linux-omap-2.6.git;a=commit;h=df01abf99660f3077315a1f69a462a8e46bacccb

should go to linux-usb@vger

balbi
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Hi,

my bad, it's already in Cc.

balbi
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

For me it seems sufficient to just remove the select of USB_SUSPEND. USB_OTG compiles fine without it.

Seems harsh to require someone to enable CONFIG_PM and USB_SUSPEND just to compile OTG drivers.

-Olof