Skip to content

Commit

Permalink
staging: emxx_udc: use list_first_entry_or_null()
Browse files Browse the repository at this point in the history
Simplify the code with list_first_entry_or_null().

Signed-off-by: Geliang Tang <geliangtang@163.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Geliang Tang authored and Greg Kroah-Hartman committed Dec 22, 2015
1 parent e7cfb39 commit e59ac74
Showing 1 changed file with 5 additions and 25 deletions.
30 changes: 5 additions & 25 deletions drivers/staging/emxx_udc/emxx_udc.c
Original file line number Diff line number Diff line change
Expand Up @@ -1285,11 +1285,7 @@ static void _nbu2ss_restert_transfer(struct nbu2ss_ep *ep)
bool bflag = FALSE;
struct nbu2ss_req *req;

if (list_empty(&ep->queue))
req = NULL;
else
req = list_entry(ep->queue.next, struct nbu2ss_req, queue);

req = list_first_entry_or_null(&ep->queue, struct nbu2ss_req, queue);
if (!req)
return;

Expand Down Expand Up @@ -1784,11 +1780,7 @@ static inline int _nbu2ss_ep0_in_data_stage(struct nbu2ss_udc *udc)
struct nbu2ss_req *req;
struct nbu2ss_ep *ep = &udc->ep[0];

if (list_empty(&ep->queue))
req = NULL;
else
req = list_entry(ep->queue.next, struct nbu2ss_req, queue);

req = list_first_entry_or_null(&ep->queue, struct nbu2ss_req, queue);
if (!req)
req = &udc->ep0_req;

Expand All @@ -1811,11 +1803,7 @@ static inline int _nbu2ss_ep0_out_data_stage(struct nbu2ss_udc *udc)
struct nbu2ss_req *req;
struct nbu2ss_ep *ep = &udc->ep[0];

if (list_empty(&ep->queue))
req = NULL;
else
req = list_entry(ep->queue.next, struct nbu2ss_req, queue);

req = list_first_entry_or_null(&ep->queue, struct nbu2ss_req, queue);
if (!req)
req = &udc->ep0_req;

Expand All @@ -1838,11 +1826,7 @@ static inline int _nbu2ss_ep0_status_stage(struct nbu2ss_udc *udc)
struct nbu2ss_req *req;
struct nbu2ss_ep *ep = &udc->ep[0];

if (list_empty(&ep->queue))
req = NULL;
else
req = list_entry(ep->queue.next, struct nbu2ss_req, queue);

req = list_first_entry_or_null(&ep->queue, struct nbu2ss_req, queue);
if (!req) {
req = &udc->ep0_req;
if (req->req.complete)
Expand Down Expand Up @@ -2145,11 +2129,7 @@ static inline void _nbu2ss_epn_int(struct nbu2ss_udc *udc, u32 epnum)
/* Interrupt Clear */
_nbu2ss_writel(&udc->p_regs->EP_REGS[num].EP_STATUS, ~(u32)status);

if (list_empty(&ep->queue))
req = NULL;
else
req = list_entry(ep->queue.next, struct nbu2ss_req, queue);

req = list_first_entry_or_null(&ep->queue, struct nbu2ss_req, queue);
if (!req) {
/* pr_warn("=== %s(%d) req == NULL\n", __func__, epnum); */
return;
Expand Down

0 comments on commit e59ac74

Please sign in to comment.