Received: from milmhbs1.lsil.com (147.145.21.209) by coscas01.lsi.com
 (172.21.36.60) with Microsoft SMTP Server id 8.1.393.1; Mon, 12 Oct 2009
 20:49:55 -0600
Received: from mail2.lsil.com (mail2.lsil.com [147.145.40.22])	by
 milmhbs1.lsil.com (8.12.11/8.12.11) with ESMTP id n9D2nt7B025414	for
 <andy.sharp@lsi.com>; Mon, 12 Oct 2009 19:49:55 -0700
Received: from psmtp.com (na3sys009amx243.postini.com [74.125.149.127])	by
 mail2.lsil.com (8.12.11/8.12.11) with SMTP id n9D2kGPY009351	for
 <andy.sharp@lsi.com>; Mon, 12 Oct 2009 19:46:17 -0700 (PDT)
Received: from source ([78.24.191.182]) by na3sys009amx243.postini.com
 ([74.125.148.14]) with SMTP;	Tue, 13 Oct 2009 02:49:54 GMT
Received: from localhost.localdomain ([127.0.0.1]:48157 "EHLO
	eddie.linux-mips.org" rhost-flags-OK-OK-OK-FAIL) by ftp.linux-mips.org	with
 ESMTP id S1491807AbZJMCtw (ORCPT <rfc822;andy.sharp@lsi.com>);	Tue, 13 Oct
 2009 04:49:52 +0200
Received: with ECARTIS (v1.0.0; list linux-mips); Tue, 13 Oct 2009 04:49:35
 +0200 (CEST)
Received: from TYO201.gate.nec.co.jp ([202.32.8.193]:43706 "EHLO
	tyo201.gate.nec.co.jp" rhost-flags-OK-OK-OK-OK) by ftp.linux-mips.org	with
 ESMTP id S1491799AbZJMCtY (ORCPT	<rfc822;linux-mips@linux-mips.org>); Tue, 13
 Oct 2009 04:49:24 +0200
Received: from relay31.aps.necel.com ([10.29.19.54])	by tyo201.gate.nec.co.jp
 (8.13.8/8.13.4) with ESMTP id n9D2mp4A007181;	Tue, 13 Oct 2009 11:49:10 +0900
 (JST)
Received: from realmbox31.aps.necel.com ([10.29.19.28] [10.29.19.28]) by
 relay31.aps.necel.com with ESMTP; Tue, 13 Oct 2009 11:49:10 +0900
Received: from [10.114.180.134] ([10.114.180.134] [10.114.180.134]) by
 mbox02.aps.necel.com with ESMTP; Tue, 13 Oct 2009 11:49:10 +0900
From: Shinya Kuribayashi <shinya.kuribayashi@necel.com>
To: "baruch@tkos.co.il" <baruch@tkos.co.il>, "linux-i2c@vger.kernel.org"
	<linux-i2c@vger.kernel.org>
CC: "ben-linux@fluff.org" <ben-linux@fluff.org>, "linux-mips@linux-mips.org"
	<linux-mips@linux-mips.org>, "linux-arm-kernel@lists.infradead.org"
	<linux-arm-kernel@lists.infradead.org>
Sender: "linux-mips-bounce@linux-mips.org" <linux-mips-bounce@linux-mips.org>
Date: Mon, 12 Oct 2009 20:49:18 -0600
Subject: [PATCH 03/16] i2c-designware: Use platform_get_irq helper
Thread-Topic: [PATCH 03/16] i2c-designware: Use platform_get_irq helper
Thread-Index: AcpLr9iks1/O129/SliVigigpoOB8g==
Message-ID: <4AD3EAAE.7070505@necel.com>
References: <4AD3E974.8080200@necel.com>
In-Reply-To: <4AD3E974.8080200@necel.com>
Accept-Language: en-US
Content-Language: en-US
X-MS-Exchange-Organization-AuthAs: Anonymous
X-MS-Exchange-Organization-AuthSource: coscas01.lsi.com
X-MS-Has-Attach:
X-Auto-Response-Suppress: All
X-MS-TNEF-Correlator:
x-scanned-by: MIMEDefang 2.39
errors-to: linux-mips-bounce@linux-mips.org
x-pstn-levels: (S:99.90000/99.90000 CV:99.9000 FC:95.5390 LC:95.5390
 R:95.9108 P:95.9108 M:97.0282 C:98.6951 )
x-pstn-settings: 3 (1.0000:1.0000) s cv gt3 gt2 gt1 r p m c 
x-pstn-addresses: from <shinya.kuribayashi@necel.com> [db-null] 
x-pstn-neptune: 0/0/0.00/0
user-agent: Thunderbird 2.0.0.23 (Windows/20090812)
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0

Signed-off-by: Shinya Kuribayashi <shinya.kuribayashi@necel.com>
---
 drivers/i2c/busses/i2c-designware.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/i2c/busses/i2c-designware.c b/drivers/i2c/busses/i2c-d=
esignware.c
index efddae1..0164092 100644
--- a/drivers/i2c/busses/i2c-designware.c
+++ b/drivers/i2c/busses/i2c-designware.c
@@ -543,8 +543,8 @@ static int __devinit dw_i2c_probe(struct platform_devic=
e *pdev)
 {
 	struct dw_i2c_dev *dev;
 	struct i2c_adapter *adap;
-	struct resource *mem, *irq, *ioarea;
-	int r;
+	struct resource *mem, *ioarea;
+	int irq, r;
=20
 	/* NOTE: driver uses the static register mapping */
 	mem =3D platform_get_resource(pdev, IORESOURCE_MEM, 0);
@@ -553,10 +553,10 @@ static int __devinit dw_i2c_probe(struct platform_dev=
ice *pdev)
 		return -EINVAL;
 	}
=20
-	irq =3D platform_get_resource(pdev, IORESOURCE_IRQ, 0);
-	if (!irq) {
+	irq =3D platform_get_irq(pdev, 0);
+	if (irq < 0) {
 		dev_err(&pdev->dev, "no irq resource?\n");
-		return -EINVAL;
+		return irq; /* -ENXIO */
 	}
=20
 	ioarea =3D request_mem_region(mem->start, resource_size(mem),
@@ -576,7 +576,7 @@ static int __devinit dw_i2c_probe(struct platform_devic=
e *pdev)
 	tasklet_init(&dev->pump_msg, dw_i2c_pump_msg, (unsigned long) dev);
 	mutex_init(&dev->lock);
 	dev->dev =3D get_device(&pdev->dev);
-	dev->irq =3D irq->start;
+	dev->irq =3D irq;
 	platform_set_drvdata(pdev, dev);
=20
 	dev->clk =3D clk_get(&pdev->dev, NULL);
--=20
1.6.5


