From: Felipe Balbi <balbi@ti.com>
To: Greg KH <gregkh@linuxfoundation.org>
Cc: <linux-serial@vger.kernel.org>, <linux-bluetooth@vger.kernel.org>,
<peter@hurleysoftware.com>, <m-karicheri2@ti.com>,
<b32955@freescale.com>,
Linux OMAP Mailing List <linux-omap@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Felipe Balbi <balbi@ti.com>
Subject: [PATCH 04/11] tty: serial: omap: switch over to platform_get_resource
Date: Thu, 20 Mar 2014 14:30:00 -0500 [thread overview]
Message-ID: <1395343807-21618-4-git-send-email-balbi@ti.com> (raw)
In-Reply-To: <1395343807-21618-1-git-send-email-balbi@ti.com>
this way we can remove one pointer declaration.
Signed-off-by: Felipe Balbi <balbi@ti.com>
---
drivers/tty/serial/omap-serial.c | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c
index 6831425..d041060 100644
--- a/drivers/tty/serial/omap-serial.c
+++ b/drivers/tty/serial/omap-serial.c
@@ -1627,7 +1627,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;
@@ -1641,12 +1640,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);
--
1.9.1.286.g5172cb3
next prev parent reply other threads:[~2014-03-20 19:30 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-20 19:29 [PATCH 01/11] tty: serial: add missing braces Felipe Balbi
2014-03-20 19:29 ` [PATCH 02/11] tty: serial: omap: switch over to devm_request_gpio Felipe Balbi
2014-03-20 19:29 ` [PATCH 03/11] tty: serial: omap: cleanup variable declarations Felipe Balbi
2014-03-20 19:30 ` Felipe Balbi [this message]
2014-03-20 19:30 ` [PATCH 05/11] tty: serial: omap: switch over to devm_ioremap_resource Felipe Balbi
2014-03-20 19:30 ` [PATCH 06/11] tty: serial: omap: remove some dead code Felipe Balbi
2014-03-20 19:30 ` [PATCH 07/11] tty: serial: omap: remove unneeded singlethread workqueue Felipe Balbi
2014-03-20 19:30 ` [PATCH 08/11] In the uart_handle_cts_change(), uart_write_wakeup() is called after we call @uart_port->ops->start_tx() Felipe Balbi
2014-03-20 19:37 ` Felipe Balbi
2014-03-20 19:30 ` [PATCH 09/11] bluetooth: hci_ldisc: fix deadlock condition Felipe Balbi
2014-03-20 19:40 ` Marcel Holtmann
2014-03-20 20:17 ` Felipe Balbi
2014-03-27 0:47 ` Peter Hurley
2014-03-27 2:09 ` Felipe Balbi
2014-03-27 2:20 ` Peter Hurley
2014-03-27 3:36 ` Felipe Balbi
2014-05-14 16:42 ` Dean Jenkins
2014-03-20 19:30 ` [PATCH 10/11] Revert "serial: omap: unlock the port lock" Felipe Balbi
2014-03-25 18:28 ` Tony Lindgren
2014-03-27 0:39 ` Peter Hurley
2014-03-27 2:10 ` Felipe Balbi
2014-03-27 2:27 ` Peter Hurley
2014-03-27 3:37 ` Felipe Balbi
2014-03-27 14:54 ` Karicheri, Muralidharan
2014-03-20 19:30 ` [PATCH 11/11] serial: fix UART_IIR_ID Felipe Balbi
2014-04-22 14:22 ` [PATCH 01/11] tty: serial: add missing braces Felipe Balbi
2014-04-23 0:28 ` Greg KH
2014-04-23 14:53 ` Felipe Balbi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1395343807-21618-4-git-send-email-balbi@ti.com \
--to=balbi@ti.com \
--cc=b32955@freescale.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-bluetooth@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=linux-serial@vger.kernel.org \
--cc=m-karicheri2@ti.com \
--cc=peter@hurleysoftware.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).