The current code is effectively equivalent to list_first_entry_or_null() so simply switch and simplify the code. Fixes: 9c39ddc60ee9 ("USB: s3c-hsotg: Fix stall condition processing") Signed-off-by: Nicholas Mc Guire <hofrat@xxxxxxxxx> --- Found by simple coccinelle scanner Compile tested with: x86_64_defconfig + CONFIG_USB_DWC2=m, CONFIG_USB_DWC2_PERIPHERAL=y Patch is against 4.9.0-rc2 (localversion-next is next-20161028) 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 24fbebc..9ac8ca0 100644 --- a/drivers/usb/dwc2/gadget.c +++ b/drivers/usb/dwc2/gadget.c @@ -1099,10 +1099,8 @@ static int dwc2_hsotg_process_req_status(struct dwc2_hsotg *hsotg, */ 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); } /** -- 1.7.10.4 -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html