linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: balbi@ti.com (Felipe Balbi)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 12/17] i2c: omap: switch to platform_get_irq()
Date: Thu, 14 Jun 2012 19:24:22 +0300	[thread overview]
Message-ID: <1339691067-919-13-git-send-email-balbi@ti.com> (raw)
In-Reply-To: <1339691067-919-1-git-send-email-balbi@ti.com>

that's a nice helper from drivers core which
will give us the exact IRQ number, instead
of a pointer to an IRQ resource.

Signed-off-by: Felipe Balbi <balbi@ti.com>
---
 drivers/i2c/busses/i2c-omap.c |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index e368f67..be7ac1a 100644
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@ -1044,11 +1044,12 @@ omap_i2c_probe(struct platform_device *pdev)
 {
 	struct omap_i2c_dev	*dev;
 	struct i2c_adapter	*adap;
-	struct resource		*mem, *irq;
+	struct resource		*mem;
 	struct omap_i2c_bus_platform_data *pdata = pdev->dev.platform_data;
 	struct device_node	*node = pdev->dev.of_node;
 	const struct of_device_id *match;
 	irq_handler_t isr;
+	int irq;
 	int r;
 
 	/* NOTE: driver uses the static register mapping */
@@ -1058,10 +1059,10 @@ omap_i2c_probe(struct platform_device *pdev)
 		return -ENODEV;
 	}
 
-	irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
-	if (!irq) {
+	irq = platform_get_irq(pdev, 0);
+	if (irq < 0) {
 		dev_err(&pdev->dev, "no irq resource?\n");
-		return -ENODEV;
+		return irq;
 	}
 
 	dev = devm_kzalloc(&pdev->dev, sizeof(struct omap_i2c_dev), GFP_KERNEL);
@@ -1089,7 +1090,7 @@ omap_i2c_probe(struct platform_device *pdev)
 	}
 
 	dev->dev = &pdev->dev;
-	dev->irq = irq->start;
+	dev->irq = irq;
 	dev->base = devm_request_and_ioremap(&pdev->dev, mem);
 	if (!dev->base) {
 		dev_err(&pdev->dev, "ioremap failed\n");
-- 
1.7.10.4

  parent reply	other threads:[~2012-06-14 16:24 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-06-14 16:24 [PATCH v2 00/17] Big OMAP I2C Cleanup Felipe Balbi
2012-06-14 16:24 ` [PATCH v2 01/17] i2c: omap: simplify num_bytes handling Felipe Balbi
2012-06-14 16:24 ` [PATCH v2 02/17] i2c: omap: decrease indentation level on data handling Felipe Balbi
2012-06-14 16:24 ` [PATCH v2 03/17] i2c: omap: add blank lines Felipe Balbi
2012-06-14 16:24 ` [PATCH v2 04/17] i2c: omap: simplify omap_i2c_ack_stat() Felipe Balbi
2012-06-14 16:24 ` [PATCH v2 05/17] i2c: omap: split out [XR]DR and [XR]RDY Felipe Balbi
2012-06-26 10:41   ` Shubhrajyoti
2012-07-02 11:33     ` Felipe Balbi
2012-07-02 11:51       ` Shubhrajyoti
2012-06-14 16:24 ` [PATCH v2 06/17] i2c: omap: improve 1p153 errata handling Felipe Balbi
2012-06-14 16:24 ` [PATCH v2 07/17] i2c: omap: re-factor receive/transmit data loop Felipe Balbi
2012-06-14 16:24 ` [PATCH v2 08/17] i2c: omap: switch over to do {} while loop Felipe Balbi
2012-06-14 16:24 ` [PATCH v2 09/17] i2c: omap: ack IRQ in parts Felipe Balbi
2012-06-14 16:24 ` [PATCH v2 10/17] i2c: omap: get rid of the "complete" label Felipe Balbi
2012-06-14 16:24 ` [PATCH v2 11/17] i2c: omap: switch to devm_* API Felipe Balbi
2012-06-14 16:24 ` Felipe Balbi [this message]
2012-06-14 16:24 ` [PATCH v2 13/17] i2c: omap: bus: add a receiver flag Felipe Balbi
2012-06-14 16:24 ` [PATCH v2 14/17] i2c: omap: simplify errata check Felipe Balbi
2012-06-14 16:24 ` [PATCH v2 15/17] i2c: omap: always return IRQ_HANDLED Felipe Balbi
2012-06-14 16:24 ` [PATCH v2 16/17] i2c: omap: simplify IRQ exit path Felipe Balbi
2012-06-14 16:24 ` [PATCH v2 17/17] i2c: omap: resize fifos before each message Felipe Balbi
2012-06-14 17:59 ` [PATCH v2 00/17] Big OMAP I2C Cleanup Wolfram Sang
2012-06-26 10:51   ` Shubhrajyoti
2012-07-02 11:37     ` Felipe Balbi
2012-07-02 11:53       ` Shubhrajyoti

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=1339691067-919-13-git-send-email-balbi@ti.com \
    --to=balbi@ti.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    /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).