Commit 05faa64e authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Greg Kroah-Hartman

serial: 8250_dw: Avoid double error messaging when IRQ absent

Since the commit 7723f4c5 ("driver core: platform: Add an error message
to platform_get_irq*()") platform_get_irq() started issuing an error message.
Thus, there is no need to have the same in the driver

Fixes: 7723f4c5 ("driver core: platform: Add an error message to platform_get_irq*()")
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: stable <stable@vger.kernel.org>
Link: https://lore.kernel.org/r/20191023103558.51862-1-andriy.shevchenko@linux.intel.comSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b027ce25
...@@ -385,10 +385,10 @@ static int dw8250_probe(struct platform_device *pdev) ...@@ -385,10 +385,10 @@ static int dw8250_probe(struct platform_device *pdev)
{ {
struct uart_8250_port uart = {}, *up = &uart; struct uart_8250_port uart = {}, *up = &uart;
struct resource *regs = platform_get_resource(pdev, IORESOURCE_MEM, 0); struct resource *regs = platform_get_resource(pdev, IORESOURCE_MEM, 0);
int irq = platform_get_irq(pdev, 0);
struct uart_port *p = &up->port; struct uart_port *p = &up->port;
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
struct dw8250_data *data; struct dw8250_data *data;
int irq;
int err; int err;
u32 val; u32 val;
...@@ -397,11 +397,9 @@ static int dw8250_probe(struct platform_device *pdev) ...@@ -397,11 +397,9 @@ static int dw8250_probe(struct platform_device *pdev)
return -EINVAL; return -EINVAL;
} }
if (irq < 0) { irq = platform_get_irq(pdev, 0);
if (irq != -EPROBE_DEFER) if (irq < 0)
dev_err(dev, "cannot get irq\n");
return irq; return irq;
}
spin_lock_init(&p->lock); spin_lock_init(&p->lock);
p->mapbase = regs->start; p->mapbase = regs->start;
......
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