>>>>> "Daniel" == Daniel Mack <zonque@xxxxxxxxx> writes:
Daniel> With the hcd is now a direct member of struct musb, we can now simply
Daniel> eliminate the musb_to_hcd() macro. There aren't that many users left
Daniel> anyway, as some where already fixed up when parts were factored out to
Daniel> musb_host.c
Daniel> Signed-off-by: Daniel Mack <zonque@xxxxxxxxx>
You seem to have forgotten to remove the musb_to_hcd() implementation.
With that fixed:
Acked-by: Peter Korsgaard <jacmet@xxxxxxxxxx>
Daniel> ---
Daniel> drivers/usb/musb/musb_core.c | 4 ++--
Daniel> drivers/usb/musb/musb_host.c | 8 ++++----
Daniel> drivers/usb/musb/musb_virthub.c | 6 +++---
Daniel> 3 files changed, 9 insertions(+), 9 deletions(-)
Daniel> diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
Daniel> index b3b9873..57b7a17 100644
Daniel> --- a/drivers/usb/musb/musb_core.c
Daniel> +++ b/drivers/usb/musb/musb_core.c
Daniel> @@ -389,7 +389,7 @@ static void musb_otg_timer_func(unsigned long data)
Daniel> */
Daniel> void musb_hnp_stop(struct musb *musb)
Daniel> {
Daniel> - struct usb_hcd *hcd = musb_to_hcd(musb);
Daniel> + struct usb_hcd *hcd = musb->hcd;
Daniel> void __iomem *mbase = musb->mregs;
Daniel> u8 reg;
Daniel> @@ -686,7 +686,7 @@ static irqreturn_t musb_stage0_irq(struct musb *musb, u8 int_usb,
Daniel> }
Daniel> if (int_usb & MUSB_INTR_CONNECT) {
Daniel> - struct usb_hcd *hcd = musb_to_hcd(musb);
Daniel> + struct usb_hcd *hcd = musb->hcd;
Daniel> handled = IRQ_HANDLED;
musb-> is_active = 1;
Daniel> diff --git a/drivers/usb/musb/musb_host.c b/drivers/usb/musb/musb_host.c
Daniel> index b6a840e..d3cbaa3 100644
Daniel> --- a/drivers/usb/musb/musb_host.c
Daniel> +++ b/drivers/usb/musb/musb_host.c
Daniel> @@ -320,9 +320,9 @@ __acquires(musb->lock)
urb-> actual_length, urb->transfer_buffer_length
Daniel> );
Daniel> - usb_hcd_unlink_urb_from_ep(musb_to_hcd(musb), urb);
Daniel> + usb_hcd_unlink_urb_from_ep(musb->hcd, urb);
Daniel> spin_unlock(&musb->lock);
Daniel> - usb_hcd_giveback_urb(musb_to_hcd(musb), urb, status);
Daniel> + usb_hcd_giveback_urb(musb->hcd, urb, status);
Daniel> spin_lock(&musb->lock);
Daniel> }
Daniel> @@ -1465,7 +1465,7 @@ done:
Daniel> if (length > qh->maxpacket)
Daniel> length = qh->maxpacket;
Daniel> /* Unmap the buffer so that CPU can use it */
Daniel> - usb_hcd_unmap_urb_for_dma(musb_to_hcd(musb), urb);
Daniel> + usb_hcd_unmap_urb_for_dma(musb->hcd, urb);
Daniel> /*
Daniel> * We need to map sg if the transfer_buffer is
Daniel> @@ -1880,7 +1880,7 @@ void musb_host_rx(struct musb *musb, u8 epnum)
Daniel> unsigned int received_len;
Daniel> /* Unmap the buffer so that CPU can use it */
Daniel> - usb_hcd_unmap_urb_for_dma(musb_to_hcd(musb), urb);
Daniel> + usb_hcd_unmap_urb_for_dma(musb->hcd, urb);
Daniel> /*
Daniel> * We need to map sg if the transfer_buffer is
Daniel> diff --git a/drivers/usb/musb/musb_virthub.c b/drivers/usb/musb/musb_virthub.c
Daniel> index 8d92ba2..5a101fe 100644
Daniel> --- a/drivers/usb/musb/musb_virthub.c
Daniel> +++ b/drivers/usb/musb/musb_virthub.c
Daniel> @@ -215,7 +215,7 @@ static void musb_port_reset(struct musb *musb, bool do_reset)
musb-> port1_status |= USB_PORT_STAT_ENABLE
Daniel> | (USB_PORT_STAT_C_RESET << 16)
Daniel> | (USB_PORT_STAT_C_ENABLE << 16);
Daniel> - usb_hcd_poll_rh_status(musb_to_hcd(musb));
Daniel> + usb_hcd_poll_rh_status(musb->hcd);
musb-> vbuserr_retry = VBUSERR_RETRY_COUNT;
Daniel> }
Daniel> @@ -228,7 +228,7 @@ void musb_root_disconnect(struct musb *musb)
musb-> port1_status = USB_PORT_STAT_POWER
Daniel> | (USB_PORT_STAT_C_CONNECTION << 16);
Daniel> - usb_hcd_poll_rh_status(musb_to_hcd(musb));
Daniel> + usb_hcd_poll_rh_status(musb->hcd);
musb-> is_active = 0;
Daniel> switch (musb->xceiv->state) {
Daniel> @@ -382,7 +382,7 @@ int musb_hub_control(
musb-> port1_status &= ~(USB_PORT_STAT_SUSPEND
Daniel> | MUSB_PORT_STAT_RESUME);
musb-> port1_status |= USB_PORT_STAT_C_SUSPEND << 16;
Daniel> - usb_hcd_poll_rh_status(musb_to_hcd(musb));
Daniel> + usb_hcd_poll_rh_status(musb->hcd);
Daniel> /* NOTE: it might really be A_WAIT_BCON ... */
musb-> xceiv->state = OTG_STATE_A_HOST;
Daniel> }
Daniel> --
Daniel> 1.8.1.4
--
Bye, Peter Korsgaard
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
