Skip to content

Commit 5440237

Browse files
Chunfeng Yungregkh
authored andcommitted
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]>
1 parent bf77804 commit 5440237

File tree

3 files changed

+5
-7
lines changed

3 files changed

+5
-7
lines changed

drivers/usb/mtu3/mtu3.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,6 @@ struct mtu3_ep {
293293
const struct usb_endpoint_descriptor *desc;
294294

295295
int flags;
296-
u8 wedged;
297296
};
298297

299298
struct mtu3_request {

drivers/usb/mtu3/mtu3_gadget.c

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -190,8 +190,7 @@ static int mtu3_gadget_ep_enable(struct usb_ep *ep,
190190
if (ret)
191191
goto error;
192192

193-
mep->wedged = 0;
194-
mep->flags |= MTU3_EP_ENABLED;
193+
mep->flags = MTU3_EP_ENABLED;
195194
mtu->active_ep++;
196195

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

220219
spin_lock_irqsave(&mtu->lock, flags);
221220
mtu3_ep_disable(mep);
222-
mep->flags &= ~MTU3_EP_ENABLED;
221+
mep->flags = 0;
223222
mtu->active_ep--;
224223
spin_unlock_irqrestore(&(mtu->lock), flags);
225224

@@ -389,7 +388,7 @@ static int mtu3_gadget_ep_set_halt(struct usb_ep *ep, int value)
389388
goto done;
390389
}
391390
} else {
392-
mep->wedged = 0;
391+
mep->flags &= ~MTU3_EP_WEDGE;
393392
}
394393

395394
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)
408407
{
409408
struct mtu3_ep *mep = to_mtu3_ep(ep);
410409

411-
mep->wedged = 1;
410+
mep->flags |= MTU3_EP_WEDGE;
412411

413412
return usb_ep_set_halt(ep);
414413
}

drivers/usb/mtu3/mtu3_gadget_ep0.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,7 @@ static int ep0_handle_feature(struct mtu3 *mtu,
417417

418418
handled = 1;
419419
/* ignore request if endpoint is wedged */
420-
if (mep->wedged)
420+
if (mep->flags & MTU3_EP_WEDGE)
421421
break;
422422

423423
mtu3_ep_stall_set(mep, set);

0 commit comments

Comments
 (0)