Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4fe160d5 authored by Heiner Kallweit's avatar Heiner Kallweit Committed by Felipe Balbi
Browse files

usb: dwc2: eliminate irq parameter from dwc2_hcd_init 



The irq is available in hsotg already, so there's no need to
pass it as separate function parameter.

Acked-by: default avatarJohn Youn <johnyoun@synopsys.com>
Signed-off-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: default avatarFelipe Balbi <felipe.balbi@linux.intel.com>
parent 348becdc

drivers/usb/dwc2/core.h

+1 −1
Original line number Diff line number Diff line
@@ -1223,7 +1223,7 @@ static inline void dwc2_hcd_connect(struct dwc2_hsotg *hsotg) {} 
static inline void dwc2_hcd_disconnect(struct dwc2_hsotg *hsotg, bool force) {}

static inline void dwc2_hcd_start(struct dwc2_hsotg *hsotg) {}

static inline void dwc2_hcd_remove(struct dwc2_hsotg *hsotg) {}

static inline int dwc2_hcd_init(struct dwc2_hsotg *hsotg, int irq)

static inline int dwc2_hcd_init(struct dwc2_hsotg *hsotg)

{ return 0; }

static inline int dwc2_backup_host_registers(struct dwc2_hsotg *hsotg)

{ return 0; }

drivers/usb/dwc2/hcd.c

+2 −2
Original line number Diff line number Diff line
@@ -5032,7 +5032,7 @@ static void dwc2_hcd_release(struct dwc2_hsotg *hsotg) 
 * USB bus with the core and calls the hc_driver->start() function. It returns

 * a negative error on failure.

 */

int dwc2_hcd_init(struct dwc2_hsotg *hsotg, int irq)

int dwc2_hcd_init(struct dwc2_hsotg *hsotg)

{

	struct platform_device *pdev = to_platform_device(hsotg->dev);

	struct resource *res;
@@ -5240,7 +5240,7 @@ int dwc2_hcd_init(struct dwc2_hsotg *hsotg, int irq) 
	 * allocates the DMA buffer pool, registers the USB bus, requests the

	 * IRQ line, and calls hcd_start method.

	 */

	retval = usb_add_hcd(hcd, irq, IRQF_SHARED);

	retval = usb_add_hcd(hcd, hsotg->irq, IRQF_SHARED);

	if (retval < 0)

		goto error4;

drivers/usb/dwc2/hcd.h

+1 −1
Original line number Diff line number Diff line
@@ -521,7 +521,7 @@ static inline u8 dwc2_hcd_is_pipe_out(struct dwc2_hcd_pipe_info *pipe) 
	return !dwc2_hcd_is_pipe_in(pipe);

}



int dwc2_hcd_init(struct dwc2_hsotg *hsotg, int irq);

int dwc2_hcd_init(struct dwc2_hsotg *hsotg);

void dwc2_hcd_remove(struct dwc2_hsotg *hsotg);



/* Transaction Execution Functions */

drivers/usb/dwc2/platform.c

+1 −1
Original line number Diff line number Diff line
@@ -445,7 +445,7 @@ static int dwc2_driver_probe(struct platform_device *dev) 
	}



	if (hsotg->dr_mode != USB_DR_MODE_PERIPHERAL) {

		retval = dwc2_hcd_init(hsotg, hsotg->irq);

		retval = dwc2_hcd_init(hsotg);

		if (retval) {

			if (hsotg->gadget_enabled)

				dwc2_hsotg_remove(hsotg);