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

Commit 7e5f01b1 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

tile: usb: Use irq_alloc/free_hwirq 



No functional change. Just convert to the new interface.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Reviewed-by: default avatarGrant Likely <grant.likely@linaro.org>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Acked-by: default avatarChris Metcalf <cmetcalf@tilera.com>
Link: http://lkml.kernel.org/r/20140507154337.177939962@linutronix.de


Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 6ef40512

drivers/usb/host/ehci-tilegx.c

+4 −4
Original line number Diff line number Diff line
@@ -142,8 +142,8 @@ static int ehci_hcd_tilegx_drv_probe(struct platform_device *pdev) 
	ehci->hcs_params = readl(&ehci->caps->hcs_params);



	/* Create our IRQs and register them. */

	pdata->irq = create_irq();

	if (pdata->irq < 0) {

	pdata->irq = irq_alloc_hwirq(-1);

	if (!pdata->irq) {

		ret = -ENXIO;

		goto err_no_irq;

	}
@@ -175,7 +175,7 @@ static int ehci_hcd_tilegx_drv_probe(struct platform_device *pdev) 
	}



err_have_irq:

	destroy_irq(pdata->irq);

	irq_free_hwirq(pdata->irq);

err_no_irq:

	tilegx_stop_ehc();

	usb_put_hcd(hcd);
@@ -193,7 +193,7 @@ static int ehci_hcd_tilegx_drv_remove(struct platform_device *pdev) 
	usb_put_hcd(hcd);

	tilegx_stop_ehc();

	gxio_usb_host_destroy(&pdata->usb_ctx);

	destroy_irq(pdata->irq);

	irq_free_hwirq(pdata->irq);



	return 0;

}

drivers/usb/host/ohci-tilegx.c

+4 −4
Original line number Diff line number Diff line
@@ -129,8 +129,8 @@ static int ohci_hcd_tilegx_drv_probe(struct platform_device *pdev) 
	tilegx_start_ohc();



	/* Create our IRQs and register them. */

	pdata->irq = create_irq();

	if (pdata->irq < 0) {

	pdata->irq = irq_alloc_hwirq(-1);

	if (!pdata->irq) {

		ret = -ENXIO;

		goto err_no_irq;

	}
@@ -164,7 +164,7 @@ static int ohci_hcd_tilegx_drv_probe(struct platform_device *pdev) 
	}



err_have_irq:

	destroy_irq(pdata->irq);

	irq_free_hwirq(pdata->irq);

err_no_irq:

	tilegx_stop_ohc();

	usb_put_hcd(hcd);
@@ -182,7 +182,7 @@ static int ohci_hcd_tilegx_drv_remove(struct platform_device *pdev) 
	usb_put_hcd(hcd);

	tilegx_stop_ohc();

	gxio_usb_host_destroy(&pdata->usb_ctx);

	destroy_irq(pdata->irq);

	irq_free_hwirq(pdata->irq);



	return 0;

}