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: Chunfeng Yun <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Greg Kroah-Hartman <[email protected]>

diff --git a/drivers/usb/mtu3/mtu3.h b/drivers/usb/mtu3/mtu3.h
index 8fd83bd133199ffe0b27d2ef7212d9605abf9ad3..71f4f02c05c6d919f5ea5a22a841131055d6d013 100644 (file)
--- a/drivers/usb/mtu3/mtu3.h
+++ b/drivers/usb/mtu3/mtu3.h
@@ -293,7 +293,6 @@ struct mtu3_ep {
        const struct usb_endpoint_descriptor *desc;
 
        int flags;
-       u8 wedged;
 };
 
 struct mtu3_request {

diff --git a/drivers/usb/mtu3/mtu3_gadget.c b/drivers/usb/mtu3/mtu3_gadget.c
index ef9fcd5dc869e2b22894fc71000f47b4e1ce04aa..73a85369eb956ad625e59384dd511e8a71d4caa8 100644 (file)
--- a/drivers/usb/mtu3/mtu3_gadget.c
+++ b/drivers/usb/mtu3/mtu3_gadget.c
@@ -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);
 }

diff --git a/drivers/usb/mtu3/mtu3_gadget_ep0.c b/drivers/usb/mtu3/mtu3_gadget_ep0.c
index 563a0a2e970d1156e7dd454e82b6902cf2a7fdc6..0ca47212f1ec1825d4e1fe5a57deebfce55f7e4c 100644 (file)
--- a/drivers/usb/mtu3/mtu3_gadget_ep0.c
+++ b/drivers/usb/mtu3/mtu3_gadget_ep0.c
@@ -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);