From 11ab4a3c272fe1abfda44b9858dfca2ffde7a0e0 Mon Sep 17 00:00:00 2001 From: Vijayavardhan Vennapusa Date: Mon, 5 Mar 2012 16:09:40 +0530 Subject: [PATCH] USB: EHCI: use otg_start_hnp() to intiate HNP in ehci-hub.c EHCI core intiates HNP by calling otg_start_hnp() API when OTG port is put into suspend to notify OTG driver which will take care of HNP by suspending host and kicking gadget. Change-Id: I2982b9f49140c2dcf2a32691e74f177e8d5d08cb Signed-off-by: Vijayavardhan Vennapusa --- drivers/usb/host/ehci-hub.c | 5 ++--- drivers/usb/host/ehci.h | 1 - 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/usb/host/ehci-hub.c b/drivers/usb/host/ehci-hub.c index 81ce8156f15..3d57addadbb 100644 --- a/drivers/usb/host/ehci-hub.c +++ b/drivers/usb/host/ehci-hub.c @@ -1126,10 +1126,9 @@ static int ehci_hub_control ( #ifdef CONFIG_USB_OTG if (hcd->self.otg_port == (wIndex + 1) && - hcd->self.b_hnp_enable && - ehci->start_hnp) { + hcd->self.b_hnp_enable) { set_bit(wIndex, &ehci->suspended_ports); - ehci->start_hnp(ehci); + otg_start_hnp(ehci->transceiver->otg); break; } #endif diff --git a/drivers/usb/host/ehci.h b/drivers/usb/host/ehci.h index a875b6a1e24..b71f9e31a2c 100644 --- a/drivers/usb/host/ehci.h +++ b/drivers/usb/host/ehci.h @@ -136,7 +136,6 @@ struct ehci_hcd { /* one per controller */ u32 command; unsigned max_log2_irq_thresh; - void (*start_hnp)(struct ehci_hcd *ehci); /* SILICON QUIRKS */ unsigned no_selective_suspend:1;