From patchwork Wed Jul 21 17:33:42 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: 113409 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 o6LHYONS007938 for ; Wed, 21 Jul 2010 17:35:12 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758448Ab0GURey (ORCPT ); Wed, 21 Jul 2010 13:34:54 -0400 Received: from mail-bw0-f46.google.com ([209.85.214.46]:59315 "EHLO mail-bw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758422Ab0GURew (ORCPT ); Wed, 21 Jul 2010 13:34:52 -0400 Received: by mail-bw0-f46.google.com with SMTP id 1so374531bwz.19 for ; Wed, 21 Jul 2010 10:34:51 -0700 (PDT) Received: by 10.204.118.3 with SMTP id t3mr325264bkq.163.1279733691043; Wed, 21 Jul 2010 10:34:51 -0700 (PDT) Received: from localhost.localdomain (93-172-119-238.bb.netvision.net.il [93.172.119.238]) by mx.google.com with ESMTPS id f10sm29348743bkl.5.2010.07.21.10.34.47 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 21 Jul 2010 10:34:50 -0700 (PDT) From: Ohad Ben-Cohen To: , , Cc: , , Chikkature Rajashekar Madhusudhan , Luciano Coelho , , San Mehat , Roger Quadros , Tony Lindgren , Nicolas Pitre , Pandita Vikram , Kalle Valo , Ohad Ben-Cohen Subject: [PATCH v2 08/20] wireless: wl1271: take irq info from private board data Date: Wed, 21 Jul 2010 20:33:42 +0300 Message-Id: <1279733634-21974-9-git-send-email-ohad@wizery.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1279733634-21974-1-git-send-email-ohad@wizery.com> References: <1279733634-21974-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]); Wed, 21 Jul 2010 17:35:12 +0000 (UTC) diff --git a/drivers/net/wireless/wl12xx/wl1271_sdio.c b/drivers/net/wireless/wl12xx/wl1271_sdio.c index 571c6b9..75901a6 100644 --- a/drivers/net/wireless/wl12xx/wl1271_sdio.c +++ b/drivers/net/wireless/wl12xx/wl1271_sdio.c @@ -28,15 +28,14 @@ #include #include #include +#include +#include #include #include "wl1271.h" #include "wl12xx_80211.h" #include "wl1271_io.h" - -#define RX71_WL1271_IRQ_GPIO 42 - static const struct sdio_device_id wl1271_devices[] = { { SDIO_DEVICE(SDIO_VENDOR_ID_TI, SDIO_DEVICE_ID_TI_WL1271) }, {} @@ -178,6 +177,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; @@ -197,9 +197,11 @@ 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; + wlan_data = mmc_get_embedded_data(func->card->host); + if (wlan_data && wlan_data->irq) + wl->irq = wlan_data->irq; + else { + ret = -EINVAL; wl1271_error("could not get irq!"); goto out_free; }