From: Ohad Ben-Cohen <ohad@wizery.com>
To: <linux-wireless@vger.kernel.org>, <linux-mmc@vger.kernel.org>,
<linux-omap@vger.kernel.org>
Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>,
<linux-arm-kernel@lists.infradead.org>,
Chikkature Rajashekar Madhusudhan <madhu.cr@ti.com>,
Luciano Coelho <luciano.coelho@nokia.com>,
<akpm@linux-foundation.org>, San Mehat <san@google.com>,
Roger Quadros <roger.quadros@nokia.com>,
Tony Lindgren <tony@atomide.com>,
Nicolas Pitre <nico@fluxnic.net>,
Pandita Vikram <vikram.pandita@ti.com>,
Kalle Valo <kalle.valo@iki.fi>, Ohad Ben-Cohen <ohad@wizery.com>
Subject: [PATCH v3 4/9] wireless: wl1271: take irq info from private board data
Date: Wed, 11 Aug 2010 01:12:23 +0300 [thread overview]
Message-ID: <1281478348-24833-5-git-send-email-ohad@wizery.com> (raw)
In-Reply-To: <1281478348-24833-1-git-send-email-ohad@wizery.com>
Remove the hard coded irq information, and instead take
the irq information from the board's platform data.
Signed-off-by: Ohad Ben-Cohen <ohad@wizery.com>
---
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
next prev parent reply other threads:[~2010-08-10 22:13 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-10 22:12 [PATCH v3 0/9] native support for wl1271 on ZOOM Ohad Ben-Cohen
2010-08-10 22:12 ` [PATCH v3 1/9] wireless: wl1271: make wl12xx.h common to both spi and sdio Ohad Ben-Cohen
2010-08-10 22:12 ` [PATCH v3 2/9] wireless: wl1271: support return value for the set power func Ohad Ben-Cohen
2010-08-10 22:12 ` [PATCH v3 3/9] wireless: wl1271: add platform driver to get board data Ohad Ben-Cohen
2010-08-10 22:12 ` Ohad Ben-Cohen [this message]
2010-08-10 22:12 ` [PATCH v3 5/9] wireless: wl1271: make ref_clock configurable by board Ohad Ben-Cohen
2010-08-10 22:12 ` [PATCH v3 6/9] omap: hsmmc: remove unused variable Ohad Ben-Cohen
2010-08-11 9:55 ` Adrian Hunter
2010-08-11 10:08 ` Ohad Ben-Cohen
2010-08-11 10:28 ` Adrian Hunter
2010-08-10 22:12 ` [PATCH v3 7/9] omap: zoom: add fixed regulator device for wlan Ohad Ben-Cohen
2010-08-10 22:12 ` [PATCH v3 8/9] omap: hsmmc: split mmc23 power control Ohad Ben-Cohen
2010-08-11 8:30 ` Roger Quadros
2010-08-11 10:05 ` Adrian Hunter
2010-08-11 10:52 ` Roger Quadros
2010-08-11 11:01 ` Ohad Ben-Cohen
2010-08-11 16:01 ` Ohad Ben-Cohen
2010-08-10 22:12 ` [PATCH v3 9/9] omap: zoom: add mmc3/wl1271 device support Ohad Ben-Cohen
2010-08-11 8:37 ` Roger Quadros
2010-08-11 9:01 ` Roger Quadros
2010-08-11 15:38 ` Ohad Ben-Cohen
2010-08-11 15:38 ` Ohad Ben-Cohen
2010-08-11 20:09 ` kishore kadiyala
2010-08-11 20:12 ` Ohad Ben-Cohen
2010-08-11 20:18 ` kishore kadiyala
2010-08-11 21:03 ` Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1281478348-24833-5-git-send-email-ohad@wizery.com \
--to=ohad@wizery.com \
--cc=akpm@linux-foundation.org \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=kalle.valo@iki.fi \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-mmc@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=luciano.coelho@nokia.com \
--cc=madhu.cr@ti.com \
--cc=nico@fluxnic.net \
--cc=roger.quadros@nokia.com \
--cc=san@google.com \
--cc=tony@atomide.com \
--cc=vikram.pandita@ti.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).