From patchwork Wed Sep 1 21:26:47 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: 147721 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o81LRBFV017621 for ; Wed, 1 Sep 2010 21:35:19 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756038Ab0IAV2G (ORCPT ); Wed, 1 Sep 2010 17:28:06 -0400 Received: from mail-bw0-f46.google.com ([209.85.214.46]:34781 "EHLO mail-bw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752983Ab0IAV2E (ORCPT ); Wed, 1 Sep 2010 17:28:04 -0400 Received: by mail-bw0-f46.google.com with SMTP id 11so43402bwz.19 for ; Wed, 01 Sep 2010 14:28:03 -0700 (PDT) Received: by 10.204.63.14 with SMTP id z14mr5951948bkh.174.1283376483780; Wed, 01 Sep 2010 14:28:03 -0700 (PDT) Received: from localhost.localdomain (46-116-15-195.bb.netvision.net.il [46.116.15.195]) by mx.google.com with ESMTPS id f18sm7637804bkf.15.2010.09.01.14.27.50 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 01 Sep 2010 14:27:54 -0700 (PDT) From: Ohad Ben-Cohen To: , , Cc: Mark Brown , , Chikkature Rajashekar Madhusudhan , Luciano Coelho , , San Mehat , Roger Quadros , Tony Lindgren , Nicolas Pitre , Ido Yariv , Kalle Valo , Russell King , Ohad Ben-Cohen Subject: [PATCH v5 4/7] wireless: wl1271: take irq info from private board data Date: Thu, 2 Sep 2010 00:26:47 +0300 Message-Id: <1283376410-9999-5-git-send-email-ohad@wizery.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1283376410-9999-1-git-send-email-ohad@wizery.com> References: <1283376410-9999-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 (demeter1.kernel.org [140.211.167.41]); Wed, 01 Sep 2010 21:35:23 +0000 (UTC) diff --git a/drivers/net/wireless/wl12xx/wl1271_sdio.c b/drivers/net/wireless/wl12xx/wl1271_sdio.c index c41293a..7f4461c 100644 --- a/drivers/net/wireless/wl12xx/wl1271_sdio.c +++ b/drivers/net/wireless/wl12xx/wl1271_sdio.c @@ -29,14 +29,12 @@ #include #include #include +#include #include "wl1271.h" #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 @@ -186,6 +184,7 @@ static int __devinit wl1271_probe(struct sdio_func *func, const struct sdio_device_id *id) { struct ieee80211_hw *hw; + struct wl12xx_platform_data wlan_data; struct wl1271 *wl; int ret; @@ -205,13 +204,14 @@ static int __devinit wl1271_probe(struct sdio_func *func, /* Grab access to FN0 for ELP reg. */ func->card->quirks |= MMC_QUIRK_LENIENT_FN0; - wl->irq = gpio_to_irq(RX71_WL1271_IRQ_GPIO); - if (wl->irq < 0) { - ret = wl->irq; - wl1271_error("could not get irq!"); + ret = wl12xx_get_platform_data(&wlan_data); + if (ret) { + wl1271_error("missing wlan data (needed for irq/ref_clk)!"); goto out_free; } + wl->irq = wlan_data.irq; + ret = request_irq(wl->irq, wl1271_irq, 0, DRIVER_NAME, wl); if (ret < 0) { wl1271_error("request_irq() failed: %d", ret);