]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
usb: ehci-orion: use platform_get_irq() for DT probing
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Thu, 15 May 2014 10:17:26 +0000 (12:17 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 27 May 2014 22:33:12 +0000 (15:33 -0700)
Commit 77dae54ab385033e488d8b07045bc7f8d931740f ('ARM: Kirkwood:
ehci-orion: Add device tree binding') added the Device Tree binding
for the ehci-orion driver. To achieve that with the irq, it used the
irq_of_parse_and_map() function when probed in DT-mode, and
platform_get_irq() when probed in non-DT mode.

This is not necessary: platform_get_irq() works just as fine in
DT-mode, since the conversion from DT information to 'struct resource'
is done by the generic layers of the kernel.

Therefore, this commit switches back to use just platform_get_irq().

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/host/ehci-orion.c

index 30d35e5e503aad45335a1e14bc431d3747d9dfbf..7728e83007a7d9d9fa29ad9a4bb3ba6f33854c6b 100644 (file)
@@ -154,10 +154,7 @@ static int ehci_orion_drv_probe(struct platform_device *pdev)
 
        pr_debug("Initializing Orion-SoC USB Host Controller\n");
 
-       if (pdev->dev.of_node)
-               irq = irq_of_parse_and_map(pdev->dev.of_node, 0);
-       else
-               irq = platform_get_irq(pdev, 0);
+       irq = platform_get_irq(pdev, 0);
        if (irq <= 0) {
                dev_err(&pdev->dev,
                        "Found HC with no IRQ. Check %s setup!\n",