From patchwork Tue Jul  6 00:37:43 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Ohad Ben Cohen <ohad@wizery.com>
X-Patchwork-Id: 110327
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o660eqVY022118
	for <patchwork-omap@patchwork.kernel.org>;
	Tue, 6 Jul 2010 00:41:08 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1757184Ab0GFAkv (ORCPT
	<rfc822;patchwork-omap@patchwork.kernel.org>);
	Mon, 5 Jul 2010 20:40:51 -0400
Received: from mail-bw0-f46.google.com ([209.85.214.46]:37901 "EHLO
	mail-bw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1757151Ab0GFAkt (ORCPT
	<rfc822; linux-omap@vger.kernel.org>); Mon, 5 Jul 2010 20:40:49 -0400
Received: by mail-bw0-f46.google.com with SMTP id 1so3098513bwz.19
	for <multiple recipients>; Mon, 05 Jul 2010 17:40:48 -0700 (PDT)
Received: by 10.204.143.88 with SMTP id t24mr3013480bku.19.1278376848696;
	Mon, 05 Jul 2010 17:40:48 -0700 (PDT)
Received: from localhost.localdomain ([46.116.56.182])
	by mx.google.com with ESMTPS id
	v6sm20227262bkx.11.2010.07.05.17.40.44
	(version=TLSv1/SSLv3 cipher=RC4-MD5);
	Mon, 05 Jul 2010 17:40:47 -0700 (PDT)
From: Ohad Ben-Cohen <ohad@wizery.com>
To: <linux-wireless@vger.kernel.org>, <linux-mmc@vger.kernel.org>,
	<linux-omap@vger.kernel.org>
Cc: <linux-arm-kernel@lists.infradead.org>, <linux@arm.linux.org.uk>,
	Chikkature Rajashekar Madhusudhan <madhu.cr@ti.com>,
	Luciano Coelho <luciano.coelho@nokia.com>, <akpm@linux-foundation.org>,
	San Mehat <san@google.com>, Ohad Ben-Cohen <ohadb@ti.com>
Subject: [PATCH 12/15] wireless: wl1271: take irq info from platform data
Date: Tue,  6 Jul 2010 03:37:43 +0300
Message-Id: <1278376666-3509-13-git-send-email-ohad@wizery.com>
X-Mailer: git-send-email 1.7.0.4
In-Reply-To: <1278376666-3509-1-git-send-email-ohad@wizery.com>
References: <1278376666-3509-1-git-send-email-ohad@wizery.com>
Sender: linux-omap-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-omap.vger.kernel.org>
X-Mailing-List: linux-omap@vger.kernel.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]);
	Tue, 06 Jul 2010 00:41:08 +0000 (UTC)


diff --git a/drivers/net/wireless/wl12xx/wl1271_sdio.c b/drivers/net/wireless/wl12xx/wl1271_sdio.c
index 96b8fc3..0af0dce 100644
--- a/drivers/net/wireless/wl12xx/wl1271_sdio.c
+++ b/drivers/net/wireless/wl12xx/wl1271_sdio.c
@@ -38,8 +38,6 @@
 #include "wl12xx_80211.h"
 #include "wl1271_io.h"
 
-
-#define RX71_WL1271_IRQ_GPIO		42
 static DECLARE_COMPLETION(wl1271_sdio_ready);
 
 static const struct sdio_device_id wl1271_devices[] = {
@@ -286,8 +284,6 @@ static int wl1271_plat_probe(struct platform_device *pdev)
 		goto out_free;
 	}
 
-	wl->irq = gpio_to_irq(RX71_WL1271_IRQ_GPIO);
-
 	wl->set_power = pdata->set_power;
 	if (!wl->set_power) {
 		wl1271_error("set power function missing in platform data");
@@ -295,9 +291,10 @@ static int wl1271_plat_probe(struct platform_device *pdev)
 		goto out_free;
 	}
 
+	wl->irq = pdata->irq;
 	if (wl->irq < 0) {
-		ret = wl->irq;
-		wl1271_error("could not get irq!");
+		wl1271_error("irq missing in platform data");
+		ret = -ENODEV;
 		goto out_free;
 	}