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

Commit 66fff14c authored by Felipe Balbi's avatar Felipe Balbi Committed by Mayank Rana
Browse files

usb: dwc3: host: extract dwc3_host_get_irq() 



Cleanup only, no functional changes.

Change-Id: Ica030ea6dc938b95ed1383f72f426188a270c73d
Signed-off-by: default avatarFelipe Balbi <felipe.balbi@linux.intel.com>
Git-commit: 6d729a55cc0fc9f9a003b61491ee5868c9df5baf
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git


[mrana@codeaurora.org: resolved minor merge conflict]
Signed-off-by: default avatarMayank Rana <mrana@codeaurora.org>
parent b89a6539

drivers/usb/dwc3/host.c

+42 −30
Original line number Diff line number Diff line
@@ -19,48 +19,60 @@ 


#include "core.h"



int dwc3_host_init(struct dwc3 *dwc)

static int dwc3_host_get_irq(struct dwc3 *dwc)

{

	struct property_entry	props[3];

	struct platform_device	*xhci;

	int			ret, irq;

	struct resource		*res;

	struct platform_device	*dwc3_pdev = to_platform_device(dwc->dev);

	int			prop_idx = 0;

	int irq;



	irq = platform_get_irq_byname(dwc3_pdev, "host");

	if (irq > 0)

		goto out;



	if (irq == -EPROBE_DEFER)

		return irq;

		goto out;



	if (irq <= 0) {

	irq = platform_get_irq_byname(dwc3_pdev, "dwc_usb3");

	if (irq > 0)

		goto out;



	if (irq == -EPROBE_DEFER)

			return irq;

		goto out;



		if (irq <= 0) {

	irq = platform_get_irq(dwc3_pdev, 0);

			if (irq <= 0) {

				if (irq != -EPROBE_DEFER) {

					dev_err(dwc->dev,

						"missing host IRQ\n");

				}

	if (irq > 0)

		goto out;



	if (irq != -EPROBE_DEFER)

		dev_err(dwc->dev, "missing host IRQ\n");



	if (!irq)

		irq = -EINVAL;



out:

	return irq;

			} else {

				res = platform_get_resource(dwc3_pdev,

							    IORESOURCE_IRQ, 0);

			}

		} else {

			res = platform_get_resource_byname(dwc3_pdev,

							   IORESOURCE_IRQ,

							   "dwc_usb3");

}



	} else {

int dwc3_host_init(struct dwc3 *dwc)

{

	struct property_entry	props[3];

	struct platform_device	*xhci;

	int			ret, irq;

	struct resource		*res;

	struct platform_device	*dwc3_pdev = to_platform_device(dwc->dev);

	int			prop_idx = 0;



	irq = dwc3_host_get_irq(dwc);

	if (irq < 0)

		return irq;



	res = platform_get_resource_byname(dwc3_pdev, IORESOURCE_IRQ, "host");

	if (!res)

		res = platform_get_resource_byname(dwc3_pdev, IORESOURCE_IRQ,

						   "host");

	}

				"dwc_usb3");

	if (!res)

		res = platform_get_resource(dwc3_pdev, IORESOURCE_IRQ, 0);

	if (!res)

		return -ENOMEM;



	dwc->xhci_resources[1].start = irq;

	dwc->xhci_resources[1].end = irq;