From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ohad Ben-Cohen Subject: [PATCH v3 4/9] wireless: wl1271: take irq info from private board data Date: Wed, 11 Aug 2010 01:12:23 +0300 Message-ID: <1281478348-24833-5-git-send-email-ohad@wizery.com> References: <1281478348-24833-1-git-send-email-ohad@wizery.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1281478348-24833-1-git-send-email-ohad@wizery.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=m.gmane.org@lists.infradead.org To: linux-wireless@vger.kernel.org, linux-mmc@vger.kernel.org, linux-omap@vger.kernel.org Cc: Kalle Valo , Ohad Ben-Cohen , Pandita Vikram , Nicolas Pitre , Tony Lindgren , Mark Brown , Roger Quadros , San Mehat , Chikkature Rajashekar Madhusudhan , Luciano Coelho , akpm@linux-foundation.org, linux-arm-kernel@lists.infradead.org List-Id: linux-omap@vger.kernel.org Remove the hard coded irq information, and instead take the irq information from the board's platform data. Signed-off-by: Ohad Ben-Cohen --- drivers/net/wireless/wl12xx/wl1271_sdio.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/net/wireless/wl12xx/wl1271_sdio.c b/drivers/net/wireless/wl12xx/wl1271_sdio.c index 5b43626..b565e64 100644 --- a/drivers/net/wireless/wl12xx/wl1271_sdio.c +++ b/drivers/net/wireless/wl12xx/wl1271_sdio.c @@ -38,9 +38,6 @@ #include "wl12xx_80211.h" #include "wl1271_io.h" - -#define RX71_WL1271_IRQ_GPIO 42 - #ifndef SDIO_VENDOR_ID_TI #define SDIO_VENDOR_ID_TI 0x0097 #endif @@ -191,6 +188,7 @@ static int wl1271_plat_probe(struct platform_device *pdev) struct wl12xx_platform_data *pdata; struct platform_driver *pdriver; struct wl12xx_plat_instance *pinstance; + int irq; pdata = pdev->dev.platform_data; if (!pdata) { @@ -198,6 +196,13 @@ static int wl1271_plat_probe(struct platform_device *pdev) return -ENODEV; } + irq = platform_get_irq(pdev, 0); + if (irq < 0) { + wl1271_error("no platform irq data"); + return -ENODEV; + } + pdata->irq = irq; + pdriver = container_of(pdev->dev.driver, struct platform_driver, driver); pinstance = container_of(pdriver, struct wl12xx_plat_instance, pdriver); @@ -290,12 +295,7 @@ static int __devinit wl1271_probe(struct sdio_func *func, goto out_free; } - wl->irq = gpio_to_irq(RX71_WL1271_IRQ_GPIO); - if (wl->irq < 0) { - ret = wl->irq; - wl1271_error("could not get irq!"); - goto put_data; - } + wl->irq = wlan_data->irq; ret = request_irq(wl->irq, wl1271_irq, 0, DRIVER_NAME, wl); if (ret < 0) { -- 1.7.0.4