tty: serial: omap: switch over to platform_get_resource
authorFelipe Balbi <balbi@ti.com>
Wed, 23 Apr 2014 14:58:32 +0000 (09:58 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 24 Apr 2014 23:19:02 +0000 (16:19 -0700)
this way we can remove one pointer declaration.

Signed-off-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/serial/omap-serial.c

index 38137403029346073e09214120d17d40f03685ce..cb45e8810b357169df552d05e43a3255a62ad672 100644 (file)
@@ -1644,7 +1644,6 @@ static int serial_omap_probe(struct platform_device *pdev)
        struct omap_uart_port_info *omap_up_info = dev_get_platdata(&pdev->dev);
        struct uart_omap_port *up;
        struct resource *mem;
-       struct resource *irq;
        int uartirq = 0;
        int wakeirq = 0;
        int ret;
@@ -1658,12 +1657,9 @@ static int serial_omap_probe(struct platform_device *pdev)
                omap_up_info = of_get_uart_port_info(&pdev->dev);
                pdev->dev.platform_data = omap_up_info;
        } else {
-               irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
-               if (!irq) {
-                       dev_err(&pdev->dev, "no irq resource?\n");
-                       return -ENODEV;
-               }
-               uartirq = irq->start;
+               uartirq = platform_get_irq(pdev, 0);
+               if (uartirq < 0)
+                       return -EPROBE_DEFER;
        }
 
        mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);