Commit 54402373 authored by Chunfeng Yun's avatar Chunfeng Yun Committed by Greg Kroah-Hartman
Browse files

usb: mtu3: use MTU3_EP_WEDGE flag 



Use MTU3_EP_WEDGE flag instead of the member @wedged in mtu3_ep
struct, then @wedged can be removed.

Signed-off-by: default avatarChunfeng Yun <chunfeng.yun@mediatek.com>
Link: https://lore.kernel.org/r/1595834101-13094-9-git-send-email-chunfeng.yun@mediatek.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent bf77804b

drivers/usb/mtu3/mtu3.h

+0 −1
Original line number Diff line number Diff line
@@ -293,7 +293,6 @@ struct mtu3_ep { 
	const struct usb_endpoint_descriptor *desc;



	int flags;

	u8 wedged;

};



struct mtu3_request {

drivers/usb/mtu3/mtu3_gadget.c

+4 −5
Original line number Diff line number Diff line
@@ -190,8 +190,7 @@ static int mtu3_gadget_ep_enable(struct usb_ep *ep, 
	if (ret)

		goto error;



	mep->wedged = 0;

	mep->flags |= MTU3_EP_ENABLED;

	mep->flags = MTU3_EP_ENABLED;

	mtu->active_ep++;



error:
@@ -219,7 +218,7 @@ static int mtu3_gadget_ep_disable(struct usb_ep *ep) 


	spin_lock_irqsave(&mtu->lock, flags);

	mtu3_ep_disable(mep);

	mep->flags &= ~MTU3_EP_ENABLED;

	mep->flags = 0;

	mtu->active_ep--;

	spin_unlock_irqrestore(&(mtu->lock), flags);
@@ -389,7 +388,7 @@ static int mtu3_gadget_ep_set_halt(struct usb_ep *ep, int value) 
			goto done;

		}

	} else {

		mep->wedged = 0;

		mep->flags &= ~MTU3_EP_WEDGE;

	}



	dev_dbg(mtu->dev, "%s %s stall\n", ep->name, value ? "set" : "clear");
@@ -408,7 +407,7 @@ static int mtu3_gadget_ep_set_wedge(struct usb_ep *ep) 
{

	struct mtu3_ep *mep = to_mtu3_ep(ep);



	mep->wedged = 1;

	mep->flags |= MTU3_EP_WEDGE;



	return usb_ep_set_halt(ep);

}

drivers/usb/mtu3/mtu3_gadget_ep0.c

+1 −1
Original line number Diff line number Diff line
@@ -417,7 +417,7 @@ static int ep0_handle_feature(struct mtu3 *mtu, 


		handled = 1;

		/* ignore request if endpoint is wedged */

		if (mep->wedged)

		if (mep->flags & MTU3_EP_WEDGE)

			break;



		mtu3_ep_stall_set(mep, set);

CRA Git | Maintained and supported by SUSTech CRA and CCSE