openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

serial/8250_dw: use platform_get_irq() instead of platform_get_resource() 

It is not recommened to use platform_get_resource(pdev, IORESOURCE_IRQ)
for requesting IRQ's resources any more, as they can be not ready yet in
case of DT-booting.

platform_get_irq() instead is a recommended way for getting IRQ even if
it was not retrieved earlier.

It also makes code simpler because we're getting "int" value right away
and no conversion from resource to int is required.

Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
Cc: Vineet Gupta <vgupta@synopsys.com>
Cc: Alan Cox <alan@linux.intel.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Alexey Brodkin 2015-03-03 18:11:14 +03:00 committed by Greg Kroah-Hartman
parent f427c990e2
commit 833b1f7b51
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/tty/serial/8250/8250_dw.c
View File

@ -384,18 +384,24 @@ static int dw8250_probe(struct platform_device *pdev)
{ {
struct uart_8250_port uart = {}; struct uart_8250_port uart = {};
struct resource *regs = platform_get_resource(pdev, IORESOURCE_MEM, 0); struct resource *regs = platform_get_resource(pdev, IORESOURCE_MEM, 0);
struct resource *irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0); int irq = platform_get_irq(pdev, 0);
struct dw8250_data *data; struct dw8250_data *data;
int err; int err;
if (!regs || !irq) { if (!regs) {
dev_err(&pdev->dev, "no registers/irq defined\n"); dev_err(&pdev->dev, "no registers defined\n");
return -EINVAL; return -EINVAL;
} }
if (irq < 0) {
if (irq != -EPROBE_DEFER)
dev_err(&pdev->dev, "cannot get irq\n");
return irq;
}
spin_lock_init(&uart.port.lock); spin_lock_init(&uart.port.lock);
uart.port.mapbase = regs->start; uart.port.mapbase = regs->start;
uart.port.irq = irq->start; uart.port.irq = irq;
uart.port.handle_irq = dw8250_handle_irq; uart.port.handle_irq = dw8250_handle_irq;
uart.port.pm = dw8250_do_pm; uart.port.pm = dw8250_do_pm;
uart.port.type = PORT_8250; uart.port.type = PORT_8250;