musb_hdrc: Remove old unused delay_port_power_off

Remove old unused delay_port_power_off

Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/drivers/usb/musb/musbdefs.h b/drivers/usb/musb/musbdefs.h
index 27b5957a4b436c0cc18a37a733a7780f26ae2888..ccc8d24bff3e7c2921ac9e0491be6e6004010d86 100644 (file)
--- a/drivers/usb/musb/musbdefs.h
+++ b/drivers/usb/musb/musbdefs.h
@@ -450,11 +450,6 @@ struct musb {
        struct usb_gadget_driver *gadget_driver;        /* its driver */
 #endif
 
-#ifdef CONFIG_USB_MUSB_OTG
-       /* FIXME this can't be OTG-specific ... ? */
-       u8 delay_port_power_off;
-#endif
-
 #ifdef MUSB_CONFIG_PROC_FS
        struct proc_dir_entry *proc_entry;
 #endif

diff --git a/drivers/usb/musb/plat_uds.c b/drivers/usb/musb/plat_uds.c
index c6ca9ea9c84bcda1b8238c8e2a602ba12c618bf4..48f4334a7c44f7375017f5e064b8f64113aa8ac7 100644 (file)
--- a/drivers/usb/musb/plat_uds.c
+++ b/drivers/usb/musb/plat_uds.c
@@ -557,7 +557,6 @@ static irqreturn_t musb_stage0_irq(struct musb * musb, u8 int_usb,
                if (is_peripheral_active(musb)) {
                        // REVISIT HNP; just force disconnect
                }
-               musb->delay_port_power_off = FALSE;
                musb_writew(mbase, MUSB_INTRTXE, musb->epmask);
                musb_writew(mbase, MUSB_INTRRXE, musb->epmask & 0xfffe);
                musb_writeb(mbase, MUSB_INTRUSBE, 0xf7);

diff --git a/drivers/usb/musb/virthub.c b/drivers/usb/musb/virthub.c
index 757da5e1da30111467a3a733b0193634e92a980f..d9f3c28f33b8efc1c97c5781cc46187439781106 100644 (file)
--- a/drivers/usb/musb/virthub.c
+++ b/drivers/usb/musb/virthub.c
@@ -121,13 +121,6 @@ static void musb_port_reset(struct musb *musb, u8 bReset)
                musb->port1_status &= ~USB_PORT_STAT_RESET;
                return;
        }
-
-       /* REVISIT this looks wrong for HNP */
-       u8 devctl = musb_readb(mbase, MUSB_DEVCTL);
-
-       if (musb->delay_port_power_off || !(devctl & MUSB_DEVCTL_HM)) {
-               return;
-       }
 #endif
 
        if (!is_host_active(musb))