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

Commit a04d46d0 authored by Felipe Balbi's avatar Felipe Balbi
Browse files

usb: musb: drop is_host_capable() and is_peripheral_capable() 



those two were defined to 1 anyway, quite useless.

Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent 032ec49f

drivers/usb/musb/musb_core.c

+18 −30
Original line number Diff line number Diff line
@@ -791,7 +791,7 @@ static irqreturn_t musb_stage0_irq(struct musb *musb, u8 int_usb, 
	 */

	if (int_usb & MUSB_INTR_RESET) {

		handled = IRQ_HANDLED;

		if (is_host_capable() && (devctl & MUSB_DEVCTL_HM) != 0) {

		if ((devctl & MUSB_DEVCTL_HM) != 0) {

			/*

			 * Looks like non-HS BABBLE can be ignored, but

			 * HS BABBLE is an error condition. For HS the solution
@@ -805,7 +805,7 @@ static irqreturn_t musb_stage0_irq(struct musb *musb, u8 int_usb, 
				ERR("Stopping host session -- babble\n");

				musb_writeb(musb->mregs, MUSB_DEVCTL, 0);

			}

		} else if (is_peripheral_capable()) {

		} else {

			dev_dbg(musb->controller, "BUS RESET as %s\n",

				otg_state_string(musb->xceiv->state));

			switch (musb->xceiv->state) {
@@ -1564,14 +1564,11 @@ irqreturn_t musb_interrupt(struct musb *musb) 
			/* musb_ep_select(musb->mregs, ep_num); */

			/* REVISIT just retval = ep->rx_irq(...) */

			retval = IRQ_HANDLED;

			if (devctl & MUSB_DEVCTL_HM) {

				if (is_host_capable())

			if (devctl & MUSB_DEVCTL_HM)

				musb_host_rx(musb, ep_num);

			} else {

				if (is_peripheral_capable())

			else

				musb_g_rx(musb, ep_num);

		}

		}



		reg >>= 1;

		ep_num++;
@@ -1585,14 +1582,11 @@ irqreturn_t musb_interrupt(struct musb *musb) 
			/* musb_ep_select(musb->mregs, ep_num); */

			/* REVISIT just retval |= ep->tx_irq(...) */

			retval = IRQ_HANDLED;

			if (devctl & MUSB_DEVCTL_HM) {

				if (is_host_capable())

			if (devctl & MUSB_DEVCTL_HM)

				musb_host_tx(musb, ep_num);

			} else {

				if (is_peripheral_capable())

			else

				musb_g_tx(musb, ep_num);

		}

		}

		reg >>= 1;

		ep_num++;

	}
@@ -1627,25 +1621,19 @@ void musb_dma_completion(struct musb *musb, u8 epnum, u8 transmit) 
	} else {

		/* endpoints 1..15 */

		if (transmit) {

			if (devctl & MUSB_DEVCTL_HM) {

				if (is_host_capable())

			if (devctl & MUSB_DEVCTL_HM)

				musb_host_tx(musb, epnum);

			} else {

				if (is_peripheral_capable())

			else

				musb_g_tx(musb, epnum);

			}

		} else {

			/* receive */

			if (devctl & MUSB_DEVCTL_HM) {

				if (is_host_capable())

			if (devctl & MUSB_DEVCTL_HM)

				musb_host_rx(musb, epnum);

			} else {

				if (is_peripheral_capable())

			else

				musb_g_rx(musb, epnum);

		}

	}

}

}

EXPORT_SYMBOL_GPL(musb_dma_completion);



#else

drivers/usb/musb/musb_core.h

+0 −4
Original line number Diff line number Diff line
@@ -84,8 +84,6 @@ struct musb_ep; 


/****************************** PERIPHERAL ROLE *****************************/



#define	is_peripheral_capable()	(1)



extern irqreturn_t musb_g_ep0_irq(struct musb *);

extern void musb_g_tx(struct musb *, u8);

extern void musb_g_rx(struct musb *, u8);
@@ -97,8 +95,6 @@ extern void musb_g_disconnect(struct musb *); 


/****************************** HOST ROLE ***********************************/



#define	is_host_capable()	(1)



extern irqreturn_t musb_h_ep0_irq(struct musb *);

extern void musb_host_tx(struct musb *, u8);

extern void musb_host_rx(struct musb *, u8);