Skip to content

Commit

Permalink
usb: mtu3: use MTU3_EP_WEDGE flag
Browse files Browse the repository at this point in the history
Use MTU3_EP_WEDGE flag instead of the member @wedged in mtu3_ep
struct, then @wedged can be removed.

Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com>
Link: https://lore.kernel.org/r/1595834101-13094-9-git-send-email-chunfeng.yun@mediatek.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Chunfeng Yun authored and Greg Kroah-Hartman committed Jul 29, 2020
1 parent bf77804 commit 5440237
Showing 3 changed files with 5 additions and 7 deletions.
1 change: 0 additions & 1 deletion drivers/usb/mtu3/mtu3.h
Original file line number Diff line number Diff line change
@@ -293,7 +293,6 @@ struct mtu3_ep {
const struct usb_endpoint_descriptor *desc;

int flags;
u8 wedged;
};

struct mtu3_request {
9 changes: 4 additions & 5 deletions drivers/usb/mtu3/mtu3_gadget.c
Original file line number Diff line number Diff line change
@@ -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);
}
2 changes: 1 addition & 1 deletion drivers/usb/mtu3/mtu3_gadget_ep0.c
Original file line number Diff line number Diff line change
@@ -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);

0 comments on commit 5440237

Please sign in to comment.