From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756791AbbCCPLZ (ORCPT ); Tue, 3 Mar 2015 10:11:25 -0500 Received: from us01smtprelay-2.synopsys.com ([198.182.47.9]:52890 "EHLO smtprelay.synopsys.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756756AbbCCPLX (ORCPT ); Tue, 3 Mar 2015 10:11:23 -0500 From: Alexey Brodkin To: linux-serial@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Alexey Brodkin , Vineet Gupta , Alan Cox , Greg Kroah-Hartman , Andy Shevchenko Subject: [PATCH v2] serial/8250_dw: use platform_get_irq() instead of platform_get_resource() Date: Tue, 3 Mar 2015 18:11:14 +0300 Message-Id: <1425395474-6762-1-git-send-email-abrodkin@synopsys.com> X-Mailer: git-send-email 2.1.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Cc: Vineet Gupta Cc: Alan Cox Cc: Greg Kroah-Hartman Cc: Andy Shevchenko --- Changes in v2: * Suppress error message if platform_get_irq() returns -EPROBE_DEFER --- drivers/tty/serial/8250/8250_dw.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/drivers/tty/serial/8250/8250_dw.c b/drivers/tty/serial/8250/8250_dw.c index e601162..cda76e8 100644 --- a/drivers/tty/serial/8250/8250_dw.c +++ b/drivers/tty/serial/8250/8250_dw.c @@ -384,18 +384,24 @@ static int dw8250_probe(struct platform_device *pdev) { struct uart_8250_port uart = {}; 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; int err; - if (!regs || !irq) { - dev_err(&pdev->dev, "no registers/irq defined\n"); + if (!regs) { + dev_err(&pdev->dev, "no registers defined\n"); 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); uart.port.mapbase = regs->start; - uart.port.irq = irq->start; + uart.port.irq = irq; uart.port.handle_irq = dw8250_handle_irq; uart.port.pm = dw8250_do_pm; uart.port.type = PORT_8250; -- 2.1.0