From patchwork Tue Aug 10 22:12:23 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ohad Ben Cohen X-Patchwork-Id: 118687 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 o7AMEFMG007347 for ; Tue, 10 Aug 2010 22:14:27 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932771Ab0HJWNm (ORCPT ); Tue, 10 Aug 2010 18:13:42 -0400 Received: from mail-bw0-f46.google.com ([209.85.214.46]:62839 "EHLO mail-bw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932905Ab0HJWNj (ORCPT ); Tue, 10 Aug 2010 18:13:39 -0400 Received: by mail-bw0-f46.google.com with SMTP id 3so2240853bwz.19 for ; Tue, 10 Aug 2010 15:13:37 -0700 (PDT) Received: by 10.204.10.137 with SMTP id p9mr12443203bkp.51.1281478417393; Tue, 10 Aug 2010 15:13:37 -0700 (PDT) Received: from localhost.localdomain (85-250-37-93.bb.netvision.net.il [85.250.37.93]) by mx.google.com with ESMTPS id f10sm4569096bkl.17.2010.08.10.15.13.33 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 10 Aug 2010 15:13:36 -0700 (PDT) From: Ohad Ben-Cohen To: , , Cc: Mark Brown , , Chikkature Rajashekar Madhusudhan , Luciano Coelho , , San Mehat , Roger Quadros , Tony Lindgren , Nicolas Pitre , Pandita Vikram , Kalle Valo , 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> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1281478348-24833-1-git-send-email-ohad@wizery.com> References: <1281478348-24833-1-git-send-email-ohad@wizery.com> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@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, 10 Aug 2010 22:14:27 +0000 (UTC) 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) {