Commit 54af692c authored by Felipe Balbi's avatar Felipe Balbi Committed by Greg Kroah-Hartman

tty: serial: omap: switch over to platform_get_resource

this way we can remove one pointer declaration.
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent cc51638a
...@@ -1644,7 +1644,6 @@ static int serial_omap_probe(struct platform_device *pdev) ...@@ -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 omap_uart_port_info *omap_up_info = dev_get_platdata(&pdev->dev);
struct uart_omap_port *up; struct uart_omap_port *up;
struct resource *mem; struct resource *mem;
struct resource *irq;
int uartirq = 0; int uartirq = 0;
int wakeirq = 0; int wakeirq = 0;
int ret; int ret;
...@@ -1658,12 +1657,9 @@ static int serial_omap_probe(struct platform_device *pdev) ...@@ -1658,12 +1657,9 @@ static int serial_omap_probe(struct platform_device *pdev)
omap_up_info = of_get_uart_port_info(&pdev->dev); omap_up_info = of_get_uart_port_info(&pdev->dev);
pdev->dev.platform_data = omap_up_info; pdev->dev.platform_data = omap_up_info;
} else { } else {
irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0); uartirq = platform_get_irq(pdev, 0);
if (!irq) { if (uartirq < 0)
dev_err(&pdev->dev, "no irq resource?\n"); return -EPROBE_DEFER;
return -ENODEV;
}
uartirq = irq->start;
} }
mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment