Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8b125df5 authored by Daniel Mack's avatar Daniel Mack Committed by Felipe Balbi
Browse files

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: default avatarDaniel Mack <zonque@gmail.com>
Acked-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent 6c5f6a6f

drivers/usb/musb/musb_core.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

drivers/usb/musb/musb_host.c

+4 −4
Original line number Diff line number Diff line
@@ -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 @@ void musb_host_tx(struct musb *musb, u8 epnum) 
	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

drivers/usb/musb/musb_host.h

+0 −2
Original line number Diff line number Diff line
@@ -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 */

drivers/usb/musb/musb_virthub.c

+3 −3
Original line number Diff line number Diff line
@@ -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;

		}

drivers/usb/musb/omap2430.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

		}