From patchwork Wed Aug 11 18:21:49 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: 176902 Return-path: X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on void.printf.net X-Spam-Level: X-Spam-Status: No, score=-1.0 required=2.9 tests=RCVD_IN_DNSWL_LOW autolearn=disabled version=3.2.5 Envelope-to: chris@printf.net Delivery-date: Wed, 11 Aug 2010 19:23:20 +0100 Received: from lists.laptop.org ([18.85.2.145] helo=mail.laptop.org) by void.printf.net with esmtp (Exim 4.69) (envelope-from ) id 1OjFxP-0008Mt-TI for chris@printf.net; Wed, 11 Aug 2010 19:23:20 +0100 Received: by mail.laptop.org (Postfix) id 4A3102497B; Wed, 11 Aug 2010 14:22:58 -0400 (EDT) Delivered-To: cjb@laptop.org Received: from spam.laptop.org (spam.laptop.org [18.85.46.23]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.laptop.org (Postfix) with ESMTPS id 51EED2497F for ; Wed, 11 Aug 2010 14:22:55 -0400 (EDT) X-ASG-Debug-ID: 1281550952-0b7467a00004-zHW3sV Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by spam.laptop.org with ESMTP id 13j1U3vJjZZIv9tW for ; Wed, 11 Aug 2010 14:22:36 -0400 (EDT) X-Barracuda-Envelope-From: linux-mmc-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754562Ab0HKSWN (ORCPT ); Wed, 11 Aug 2010 14:22:13 -0400 Received: from mail-fx0-f46.google.com ([209.85.161.46]:43673 "EHLO mail-fx0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754144Ab0HKSWL (ORCPT ); Wed, 11 Aug 2010 14:22:11 -0400 Received: by mail-fx0-f46.google.com with SMTP id 13so329448fxm.19 for ; Wed, 11 Aug 2010 11:22:09 -0700 (PDT) Received: by 10.223.105.76 with SMTP id s12mr8966827fao.107.1281550929591; Wed, 11 Aug 2010 11:22:09 -0700 (PDT) Received: from localhost.localdomain (93-172-109-60.bb.netvision.net.il [93.172.109.60]) by mx.google.com with ESMTPS id r8sm250611faq.34.2010.08.11.11.22.06 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 11 Aug 2010 11:22:08 -0700 (PDT) From: Ohad Ben-Cohen To: , , Cc: Ido Yariv , Mark Brown , , Chikkature Rajashekar Madhusudhan , Luciano Coelho , , San Mehat , Roger Quadros , Tony Lindgren , Nicolas Pitre , Pandita Vikram , Kalle Valo , Ohad Ben-Cohen X-ASG-Orig-Subj: [PATCH v4 4/8] wireless: wl1271: take irq info from private board data Subject: [PATCH v4 4/8] wireless: wl1271: take irq info from private board data Date: Wed, 11 Aug 2010 21:21:49 +0300 Message-Id: <1281550913-17633-5-git-send-email-ohad@wizery.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1281550913-17633-1-git-send-email-ohad@wizery.com> References: <1281550913-17633-1-git-send-email-ohad@wizery.com> Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Barracuda-Connect: vger.kernel.org[209.132.180.67] X-Barracuda-Start-Time: 1281550956 X-Barracuda-URL: http://18.85.46.23:8000/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at laptop.org X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using global scores of TAG_LEVEL=3.5 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=5.5 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.37700 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- diff --git a/drivers/net/wireless/wl12xx/wl1271_sdio.c b/drivers/net/wireless/wl12xx/wl1271_sdio.c index 68b512b..228f5af 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) {