Commit c9c5f057 authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman
Browse files

USB: gadget: drop irq-flags initialisations 



There's no need to initialise irq-flags variables before saving the
interrupt state.

Drop the redundant initialisations from drivers that got this wrong.

Cc: Li Yang <leoyang.li@nxp.com>
Cc: Felipe Balbi <balbi@kernel.org>
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Link: https://lore.kernel.org/r/20210519093303.10789-4-johan@kernel.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8879904b

drivers/usb/gadget/udc/fsl_udc_core.c

+4 −4
Original line number Diff line number Diff line
@@ -547,7 +547,7 @@ static int fsl_ep_enable(struct usb_ep *_ep, 
	unsigned short max = 0;

	unsigned char mult = 0, zlt;

	int retval = -EINVAL;

	unsigned long flags = 0;

	unsigned long flags;



	ep = container_of(_ep, struct fsl_ep, ep);
@@ -631,7 +631,7 @@ static int fsl_ep_disable(struct usb_ep *_ep) 
{

	struct fsl_udc *udc = NULL;

	struct fsl_ep *ep = NULL;

	unsigned long flags = 0;

	unsigned long flags;

	u32 epctrl;

	int ep_num;
@@ -1001,7 +1001,7 @@ out: epctrl = fsl_readl(&dr_regs->endptctrl[ep_num]); 
static int fsl_ep_set_halt(struct usb_ep *_ep, int value)

{

	struct fsl_ep *ep = NULL;

	unsigned long flags = 0;

	unsigned long flags;

	int status = -EOPNOTSUPP;	/* operation not supported */

	unsigned char ep_dir = 0, ep_num = 0;

	struct fsl_udc *udc = NULL;
@@ -1938,7 +1938,7 @@ static int fsl_udc_start(struct usb_gadget *g, 
		struct usb_gadget_driver *driver)

{

	int retval = 0;

	unsigned long flags = 0;

	unsigned long flags;



	/* lock is needed but whether should use this lock or another */

	spin_lock_irqsave(&udc_controller->lock, flags);

drivers/usb/gadget/udc/mv_u3d_core.c

+1 −1
Original line number Diff line number Diff line
@@ -941,7 +941,7 @@ mv_u3d_ep_set_stall(struct mv_u3d *u3d, u8 ep_num, u8 direction, int stall) 
static int mv_u3d_ep_set_halt_wedge(struct usb_ep *_ep, int halt, int wedge)

{

	struct mv_u3d_ep *ep;

	unsigned long flags = 0;

	unsigned long flags;

	int status = 0;

	struct mv_u3d *u3d;

drivers/usb/gadget/udc/mv_udc_core.c

+1 −1
Original line number Diff line number Diff line
@@ -888,7 +888,7 @@ static int ep_is_stall(struct mv_udc *udc, u8 ep_num, u8 direction) 
static int mv_ep_set_halt_wedge(struct usb_ep *_ep, int halt, int wedge)

{

	struct mv_ep *ep;

	unsigned long flags = 0;

	unsigned long flags;

	int status = 0;

	struct mv_udc *udc;