diff options
| author | Felipe Balbi <balbi@ti.com> | 2014-04-23 09:58:32 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-04-24 16:19:02 -0700 |
| commit | 54af692c9fcd736977bc94293c73997e94f17378 (patch) | |
| tree | 2d635a34c2d62143978b4454e455e3cea03fa4bb /drivers | |
| parent | cc51638ab4e8a0489b943ed027c37214540a07a6 (diff) | |
| download | blackbird-op-linux-54af692c9fcd736977bc94293c73997e94f17378.tar.gz blackbird-op-linux-54af692c9fcd736977bc94293c73997e94f17378.zip | |
tty: serial: omap: switch over to platform_get_resource
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/tty/serial/omap-serial.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c index 381374030293..cb45e8810b35 100644 --- a/drivers/tty/serial/omap-serial.c +++ b/drivers/tty/serial/omap-serial.c @@ -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); |
