diff mbox

[12/15] wireless: wl1271: take irq info from platform data

Message ID 1278376666-3509-13-git-send-email-ohad@wizery.com (mailing list archive)
State Awaiting Upstream, archived
Headers show

Commit Message

Ohad Ben Cohen July 6, 2010, 12:37 a.m. UTC 
None
diff mbox

Patch

diff --git a/drivers/net/wireless/wl12xx/wl1271_sdio.c b/drivers/net/wireless/wl12xx/wl1271_sdio.c
index 96b8fc3..0af0dce 100644
--- a/drivers/net/wireless/wl12xx/wl1271_sdio.c
+++ b/drivers/net/wireless/wl12xx/wl1271_sdio.c
@@ -38,8 +38,6 @@ 
 #include "wl12xx_80211.h"
 #include "wl1271_io.h"
 
-
-#define RX71_WL1271_IRQ_GPIO		42
 static DECLARE_COMPLETION(wl1271_sdio_ready);
 
 static const struct sdio_device_id wl1271_devices[] = {
@@ -286,8 +284,6 @@  static int wl1271_plat_probe(struct platform_device *pdev)
 		goto out_free;
 	}
 
-	wl->irq = gpio_to_irq(RX71_WL1271_IRQ_GPIO);
-
 	wl->set_power = pdata->set_power;
 	if (!wl->set_power) {
 		wl1271_error("set power function missing in platform data");
@@ -295,9 +291,10 @@  static int wl1271_plat_probe(struct platform_device *pdev)
 		goto out_free;
 	}
 
+	wl->irq = pdata->irq;
 	if (wl->irq < 0) {
-		ret = wl->irq;
-		wl1271_error("could not get irq!");
+		wl1271_error("irq missing in platform data");
+		ret = -ENODEV;
 		goto out_free;
 	}