Skip to content

Commit fde9156

Browse files
Chunfeng Yungregkh
authored andcommitted
usb: mtu3: remove unnecessary pointer checks
The class driver will ensure the parameters are valid pointers before call the hook function of usb_ep_ops, so no need check them again. 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 ec37198 commit fde9156

File tree

1 file changed

+6
-19
lines changed

1 file changed

+6
-19
lines changed

drivers/usb/mtu3/mtu3_gadget.c

Lines changed: 6 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -263,23 +263,15 @@ void mtu3_free_request(struct usb_ep *ep, struct usb_request *req)
263263
static int mtu3_gadget_queue(struct usb_ep *ep,
264264
struct usb_request *req, gfp_t gfp_flags)
265265
{
266-
struct mtu3_ep *mep;
267-
struct mtu3_request *mreq;
268-
struct mtu3 *mtu;
266+
struct mtu3_ep *mep = to_mtu3_ep(ep);
267+
struct mtu3_request *mreq = to_mtu3_request(req);
268+
struct mtu3 *mtu = mep->mtu;
269269
unsigned long flags;
270270
int ret = 0;
271271

272-
if (!ep || !req)
273-
return -EINVAL;
274-
275272
if (!req->buf)
276273
return -ENODATA;
277274

278-
mep = to_mtu3_ep(ep);
279-
mtu = mep->mtu;
280-
mreq = to_mtu3_request(req);
281-
mreq->mtu = mtu;
282-
283275
if (mreq->mep != mep)
284276
return -EINVAL;
285277

@@ -303,6 +295,7 @@ static int mtu3_gadget_queue(struct usb_ep *ep,
303295
return -ESHUTDOWN;
304296
}
305297

298+
mreq->mtu = mtu;
306299
mreq->request.actual = 0;
307300
mreq->request.status = -EINPROGRESS;
308301

@@ -335,11 +328,11 @@ static int mtu3_gadget_dequeue(struct usb_ep *ep, struct usb_request *req)
335328
struct mtu3_ep *mep = to_mtu3_ep(ep);
336329
struct mtu3_request *mreq = to_mtu3_request(req);
337330
struct mtu3_request *r;
331+
struct mtu3 *mtu = mep->mtu;
338332
unsigned long flags;
339333
int ret = 0;
340-
struct mtu3 *mtu = mep->mtu;
341334

342-
if (!ep || !req || mreq->mep != mep)
335+
if (mreq->mep != mep)
343336
return -EINVAL;
344337

345338
dev_dbg(mtu->dev, "%s : req=%p\n", __func__, req);
@@ -379,9 +372,6 @@ static int mtu3_gadget_ep_set_halt(struct usb_ep *ep, int value)
379372
unsigned long flags;
380373
int ret = 0;
381374

382-
if (!ep)
383-
return -EINVAL;
384-
385375
dev_dbg(mtu->dev, "%s : %s...", __func__, ep->name);
386376

387377
spin_lock_irqsave(&mtu->lock, flags);
@@ -424,9 +414,6 @@ static int mtu3_gadget_ep_set_wedge(struct usb_ep *ep)
424414
{
425415
struct mtu3_ep *mep = to_mtu3_ep(ep);
426416

427-
if (!ep)
428-
return -EINVAL;
429-
430417
mep->wedged = 1;
431418

432419
return usb_ep_set_halt(ep);

0 commit comments

Comments
 (0)