usb: musb: eliminate musb_to_hcd

With the hcd is now a direct member of struct musb, we can now simply
eliminate the musb_to_hcd() macro. There aren't that many users left
anyway, as some where already fixed up when parts were factored out to
musb_host.c

Signed-off-by: Daniel Mack <zonque@gmail.com>
Acked-by: Peter Korsgaard <jacmet@sunsite.dk>
Signed-off-by: Felipe Balbi <balbi@ti.com>

5 files changed, 10 insertions, 12 deletions

diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
index a04cf8b1678b..29a24ced6748 100644
--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -388,7 +388,7 @@ static void musb_otg_timer_func(unsigned long data)
  */
 void musb_hnp_stop(struct musb *musb)
 {
-        struct usb_hcd  *hcd = musb_to_hcd(musb);
+        struct usb_hcd  *hcd = musb->hcd;
         void __iomem    *mbase = musb->mregs;
         u8      reg;
 
@@ -685,7 +685,7 @@ static irqreturn_t musb_stage0_irq(struct musb *musb, u8 int_usb,
         }
 
         if (int_usb & MUSB_INTR_CONNECT) {
-                struct usb_hcd *hcd = musb_to_hcd(musb);
+                struct usb_hcd *hcd = musb->hcd;
 
                 handled = IRQ_HANDLED;
                 musb->is_active = 1;
diff --git a/drivers/usb/musb/musb_host.c b/drivers/usb/musb/musb_host.c
index 6057c2363e86..f15d114572d5 100644
--- a/drivers/usb/musb/musb_host.c
+++ b/drivers/usb/musb/musb_host.c
@@ -315,9 +315,9 @@ __acquires(musb->lock)
                         urb->actual_length, urb->transfer_buffer_length
                         );
 
-        usb_hcd_unlink_urb_from_ep(musb_to_hcd(musb), urb);
+        usb_hcd_unlink_urb_from_ep(musb->hcd, urb);
         spin_unlock(&musb->lock);
-        usb_hcd_giveback_urb(musb_to_hcd(musb), urb, status);
+        usb_hcd_giveback_urb(musb->hcd, urb, status);
         spin_lock(&musb->lock);
 }
 
@@ -1460,7 +1460,7 @@ done:
         if (length > qh->maxpacket)
                 length = qh->maxpacket;
         /* Unmap the buffer so that CPU can use it */
-        usb_hcd_unmap_urb_for_dma(musb_to_hcd(musb), urb);
+        usb_hcd_unmap_urb_for_dma(musb->hcd, urb);
 
         /*
          * We need to map sg if the transfer_buffer is
@@ -1875,7 +1875,7 @@ void musb_host_rx(struct musb *musb, u8 epnum)
                         unsigned int received_len;
 
                         /* Unmap the buffer so that CPU can use it */
-                        usb_hcd_unmap_urb_for_dma(musb_to_hcd(musb), urb);
+                        usb_hcd_unmap_urb_for_dma(musb->hcd, urb);
 
                         /*
                          * We need to map sg if the transfer_buffer is
diff --git a/drivers/usb/musb/musb_host.h b/drivers/usb/musb/musb_host.h
index 48a4bdd8b9f9..c202d5ba684b 100644
--- a/drivers/usb/musb/musb_host.h
+++ b/drivers/usb/musb/musb_host.h
@@ -37,8 +37,6 @@
 
 #include <linux/scatterlist.h>
 
-#define musb_to_hcd(MUSB) ((MUSB)->hcd)
-
 /* stored in "usb_host_endpoint.hcpriv" for scheduled endpoints */
 struct musb_qh {
         struct usb_host_endpoint *hep;          /* usbcore info */
diff --git a/drivers/usb/musb/musb_virthub.c b/drivers/usb/musb/musb_virthub.c
index 104d22f7142d..a523950c2b32 100644
--- a/drivers/usb/musb/musb_virthub.c
+++ b/drivers/usb/musb/musb_virthub.c
@@ -212,7 +212,7 @@ static void musb_port_reset(struct musb *musb, bool do_reset)
                 musb->port1_status |= USB_PORT_STAT_ENABLE
                                         | (USB_PORT_STAT_C_RESET << 16)
                                         | (USB_PORT_STAT_C_ENABLE << 16);
-                usb_hcd_poll_rh_status(musb_to_hcd(musb));
+                usb_hcd_poll_rh_status(musb->hcd);
 
                 musb->vbuserr_retry = VBUSERR_RETRY_COUNT;
         }
@@ -225,7 +225,7 @@ void musb_root_disconnect(struct musb *musb)
         musb->port1_status = USB_PORT_STAT_POWER
                         | (USB_PORT_STAT_C_CONNECTION << 16);
 
-        usb_hcd_poll_rh_status(musb_to_hcd(musb));
+        usb_hcd_poll_rh_status(musb->hcd);
         musb->is_active = 0;
 
         switch (musb->xceiv->state) {
@@ -379,7 +379,7 @@ int musb_hub_control(
                         musb->port1_status &= ~(USB_PORT_STAT_SUSPEND
                                         | MUSB_PORT_STAT_RESUME);
                         musb->port1_status |= USB_PORT_STAT_C_SUSPEND << 16;
-                        usb_hcd_poll_rh_status(musb_to_hcd(musb));
+                        usb_hcd_poll_rh_status(musb->hcd);
                         /* NOTE: it might really be A_WAIT_BCON ... */
                         musb->xceiv->state = OTG_STATE_A_HOST;
                 }
diff --git a/drivers/usb/musb/omap2430.c b/drivers/usb/musb/omap2430.c
index b3e77613e0af..c7c1d7ab5471 100644
--- a/drivers/usb/musb/omap2430.c
+++ b/drivers/usb/musb/omap2430.c
@@ -87,7 +87,7 @@ static void musb_do_idle(unsigned long _musb)
                         musb->port1_status &= ~(USB_PORT_STAT_SUSPEND
                                                 | MUSB_PORT_STAT_RESUME);
                         musb->port1_status |= USB_PORT_STAT_C_SUSPEND << 16;
-                        usb_hcd_poll_rh_status(musb_to_hcd(musb));
+                        usb_hcd_poll_rh_status(musb->hcd);
                         /* NOTE: it might really be A_WAIT_BCON ... */
                         musb->xceiv->state = OTG_STATE_A_HOST;
                 }