From 716003bb8bc4a54a48721b0206e22fa471176b18 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Tue, 6 Mar 2018 13:03:56 +0300 Subject: [PATCH] staging: emxx_udc: Remove unnecessary NULL checks These pointers can't be NULL so I have removed the checks. The checking was sort of problematic as well because it didn't make sense. In _nbu2ss_read_request_data() the && should have been ||. In nbu2ss_gad_get_frame() we know that "pgadget" is non-NULL and "udc" is an offset from "pgadget" so it can't be NULL. Signed-off-by: Dan Carpenter Signed-off-by: Greg Kroah-Hartman --- drivers/staging/emxx_udc/emxx_udc.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/drivers/staging/emxx_udc/emxx_udc.c b/drivers/staging/emxx_udc/emxx_udc.c index ad69a1e536a7..3e51476a7045 100644 --- a/drivers/staging/emxx_udc/emxx_udc.c +++ b/drivers/staging/emxx_udc/emxx_udc.c @@ -1672,9 +1672,6 @@ static int std_req_set_configuration(struct nbu2ss_udc *udc) /*-------------------------------------------------------------------------*/ static inline void _nbu2ss_read_request_data(struct nbu2ss_udc *udc, u32 *pdata) { - if ((!udc) && (!pdata)) - return; - *pdata = _nbu2ss_readl(&udc->p_regs->SETUP_DATA0); pdata++; *pdata = _nbu2ss_readl(&udc->p_regs->SETUP_DATA1); @@ -2941,11 +2938,6 @@ static int nbu2ss_gad_get_frame(struct usb_gadget *pgadget) } udc = container_of(pgadget, struct nbu2ss_udc, gadget); - if (!udc) { - dev_err(&pgadget->dev, "%s, udc == NULL\n", __func__); - return -EINVAL; - } - data = gpio_get_value(VBUS_VALUE); if (data == 0) return -EINVAL;