From mboxrd@z Thu Jan 1 00:00:00 1970 From: Felipe Balbi Subject: [PATCH 12/17] i2c: omap: switch to platform_get_irq() Date: Thu, 14 Jun 2012 13:20:45 +0300 Message-ID: <1339669250-9183-13-git-send-email-balbi@ti.com> References: <1339669250-9183-1-git-send-email-balbi@ti.com> Return-path: In-Reply-To: <1339669250-9183-1-git-send-email-balbi@ti.com> Sender: linux-kernel-owner@vger.kernel.org To: ben-linux@fluff.org Cc: Tony Lindgren , w.sang@pengutronix.de, Linux OMAP Mailing List , linux-i2c@vger.kernel.org, Linux ARM Kernel Mailing List , Linux Kernel Mailing List , Felipe Balbi List-Id: linux-i2c@vger.kernel.org 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 --- 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 d805270..43d3289 100644 --- a/drivers/i2c/busses/i2c-omap.c +++ b/drivers/i2c/busses/i2c-omap.c @@ -1045,11 +1045,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 */ @@ -1059,10 +1060,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); @@ -1090,7 +1091,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