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

Commit 7ad76955 authored by Bin Liu's avatar Bin Liu Committed by Greg Kroah-Hartman
Browse files

usb: musb: remove duplicated port mode enum 



include/linux/usb/musb.h already defines enum for musb port mode, so
remove the duplicate in musb_core.h and use the definition in musb.h.

Signed-off-by: default avatarBin Liu <b-liu@ti.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 55479956

drivers/usb/musb/musb_core.c

+4 −4
Original line number Diff line number Diff line
@@ -1038,7 +1038,7 @@ void musb_start(struct musb *musb) 
	 * (b) vbus present/connect IRQ, peripheral mode;

	 * (c) peripheral initiates, using SRP

	 */

	if (musb->port_mode != MUSB_PORT_MODE_HOST &&

	if (musb->port_mode != MUSB_HOST &&

			musb->xceiv->otg->state != OTG_STATE_A_WAIT_BCON &&

			(devctl & MUSB_DEVCTL_VBUS) == MUSB_DEVCTL_VBUS) {

		musb->is_active = 1;
@@ -2323,19 +2323,19 @@ musb_init_controller(struct device *dev, int nIrq, void __iomem *ctrl) 
	}



	switch (musb->port_mode) {

	case MUSB_PORT_MODE_HOST:

	case MUSB_HOST:

		status = musb_host_setup(musb, plat->power);

		if (status < 0)

			goto fail3;

		status = musb_platform_set_mode(musb, MUSB_HOST);

		break;

	case MUSB_PORT_MODE_GADGET:

	case MUSB_PERIPHERAL:

		status = musb_gadget_setup(musb);

		if (status < 0)

			goto fail3;

		status = musb_platform_set_mode(musb, MUSB_PERIPHERAL);

		break;

	case MUSB_PORT_MODE_DUAL_ROLE:

	case MUSB_OTG:

		status = musb_host_setup(musb, plat->power);

		if (status < 0)

			goto fail3;

drivers/usb/musb/musb_core.h

+1 −7
Original line number Diff line number Diff line
@@ -53,12 +53,6 @@ struct musb_ep; 
#define is_peripheral_active(m)		(!(m)->is_host)

#define is_host_active(m)		((m)->is_host)



enum {

	MUSB_PORT_MODE_HOST	= 1,

	MUSB_PORT_MODE_GADGET,

	MUSB_PORT_MODE_DUAL_ROLE,

};



/****************************** CONSTANTS ********************************/



#ifndef MUSB_C_NUM_EPS
@@ -351,7 +345,7 @@ struct musb { 


	u8			min_power;	/* vbus for periph, in mA/2 */



	int			port_mode;	/* MUSB_PORT_MODE_* */

	enum musb_mode		port_mode;

	bool			session;

	unsigned long		quirk_retries;

	bool			is_host;

drivers/usb/musb/musb_dsps.c

+3 −3
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ static void dsps_musb_enable(struct musb *musb) 
	musb_writel(reg_base, wrp->coreintr_set, coremask);

	/* start polling for ID change in dual-role idle mode */

	if (musb->xceiv->otg->state == OTG_STATE_B_IDLE &&

			musb->port_mode == MUSB_PORT_MODE_DUAL_ROLE)

			musb->port_mode == MUSB_OTG)

		dsps_mod_timer(glue, -1);

}
@@ -231,7 +231,7 @@ static int dsps_check_status(struct musb *musb, void *unused) 
		break;

	case OTG_STATE_A_WAIT_BCON:

		/* keep VBUS on for host-only mode */

		if (musb->port_mode == MUSB_PORT_MODE_HOST) {

		if (musb->port_mode == MUSB_HOST) {

			dsps_mod_timer_optional(glue);

			break;

		}
@@ -1028,7 +1028,7 @@ static int dsps_resume(struct device *dev) 
	musb_writel(mbase, wrp->tx_mode, glue->context.tx_mode);

	musb_writel(mbase, wrp->rx_mode, glue->context.rx_mode);

	if (musb->xceiv->otg->state == OTG_STATE_B_IDLE &&

	    musb->port_mode == MUSB_PORT_MODE_DUAL_ROLE)

	    musb->port_mode == MUSB_OTG)

		dsps_mod_timer(glue, -1);



	pm_runtime_put(dev);

drivers/usb/musb/musb_gadget.c

+1 −1
Original line number Diff line number Diff line
@@ -1823,7 +1823,7 @@ int musb_gadget_setup(struct musb *musb) 


void musb_gadget_cleanup(struct musb *musb)

{

	if (musb->port_mode == MUSB_PORT_MODE_HOST)

	if (musb->port_mode == MUSB_HOST)

		return;



	cancel_delayed_work_sync(&musb->gadget_work);

drivers/usb/musb/musb_host.c

+2 −2
Original line number Diff line number Diff line
@@ -2735,7 +2735,7 @@ int musb_host_alloc(struct musb *musb) 


void musb_host_cleanup(struct musb *musb)

{

	if (musb->port_mode == MUSB_PORT_MODE_GADGET)

	if (musb->port_mode == MUSB_PERIPHERAL)

		return;

	usb_remove_hcd(musb->hcd);

}
@@ -2750,7 +2750,7 @@ int musb_host_setup(struct musb *musb, int power_budget) 
	int ret;

	struct usb_hcd *hcd = musb->hcd;



	if (musb->port_mode == MUSB_PORT_MODE_HOST) {

	if (musb->port_mode == MUSB_HOST) {

		MUSB_HST_MODE(musb);

		musb->xceiv->otg->default_a = 1;

		musb->xceiv->otg->state = OTG_STATE_A_IDLE;