Commit 716003bb authored by Dan Carpenter's avatar Dan Carpenter Committed by Greg Kroah-Hartman
Browse files

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: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0defb439

drivers/staging/emxx_udc/emxx_udc.c

+0 −8
Original line number Diff line number Diff line
@@ -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;