From ccc85416af6fe0a2318def90f067ce0c17ca2fb3 Mon Sep 17 00:00:00 2001 From: Masahiro Yamada Date: Mon, 19 Sep 2016 01:03:13 +0900 Subject: [PATCH] UPSTREAM: usb: dwc2: cleanup with list_first_entry_or_null() The combo of list_empty() check and return list_first_entry() can be replaced with list_first_entry_or_null(). Change-Id: I562e6b5a1961c7003b2016c35b32fd56e1d36240 Signed-off-by: Masahiro Yamada Acked-by: John Youn Signed-off-by: Felipe Balbi Signed-off-by: William Wu (cherry picked from commit ffc4b4067e1bb639834a716b4148efce736b2ba6) --- drivers/usb/dwc2/gadget.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/usb/dwc2/gadget.c b/drivers/usb/dwc2/gadget.c index 2de8b827a893..ee5ce1f7e7e0 100644 --- a/drivers/usb/dwc2/gadget.c +++ b/drivers/usb/dwc2/gadget.c @@ -1099,10 +1099,8 @@ static int dwc2_hsotg_ep_sethalt(struct usb_ep *ep, int value, bool now); */ static struct dwc2_hsotg_req *get_ep_head(struct dwc2_hsotg_ep *hs_ep) { - if (list_empty(&hs_ep->queue)) - return NULL; - - return list_first_entry(&hs_ep->queue, struct dwc2_hsotg_req, queue); + return list_first_entry_or_null(&hs_ep->queue, struct dwc2_hsotg_req, + queue); } /**