From fe4427ce6ff2706921edb39c5238f22d3c15d0f8 Mon Sep 17 00:00:00 2001
From: Ohad Ben-Cohen <ohad@wizery.com>
Date: Thu, 16 Sep 2010 01:31:12 +0200
Subject: [PATCH] --- yaml --- r: 214713 b: refs/heads/master c:
 61ee7007a5d61aa066076da578e8e8084e122d7d h: refs/heads/master i:   214711:
 ca9dee55b2aefe2067ebf637d16689203f5102f5 v: v3

---
 [refs]                                        |  2 +-
 trunk/drivers/net/wireless/Makefile           |  2 ++
 trunk/drivers/net/wireless/wl12xx/Kconfig     |  5 +++-
 .../wireless/wl12xx/wl12xx_platform_data.c    | 28 +++++++++++++++++++
 trunk/include/linux/wl12xx.h                  |  3 ++
 5 files changed, 38 insertions(+), 2 deletions(-)
 create mode 100644 trunk/drivers/net/wireless/wl12xx/wl12xx_platform_data.c

diff --git a/[refs] b/[refs]
index a93ff6f3aee0..8f147f2b24f7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2cc78ff78c0af502b040d4527212e29e02d3231d
+refs/heads/master: 61ee7007a5d61aa066076da578e8e8084e122d7d
diff --git a/trunk/drivers/net/wireless/Makefile b/trunk/drivers/net/wireless/Makefile
index 5d4ce4d2b32b..85af697574a6 100644
--- a/trunk/drivers/net/wireless/Makefile
+++ b/trunk/drivers/net/wireless/Makefile
@@ -50,5 +50,7 @@ obj-$(CONFIG_ATH_COMMON)	+= ath/
 obj-$(CONFIG_MAC80211_HWSIM)	+= mac80211_hwsim.o
 
 obj-$(CONFIG_WL12XX)	+= wl12xx/
+# small builtin driver bit
+obj-$(CONFIG_WL12XX_PLATFORM_DATA)	+= wl12xx/wl12xx_platform_data.o
 
 obj-$(CONFIG_IWM)	+= iwmc3200wifi/
diff --git a/trunk/drivers/net/wireless/wl12xx/Kconfig b/trunk/drivers/net/wireless/wl12xx/Kconfig
index 2f98058be451..4a8bb25c1739 100644
--- a/trunk/drivers/net/wireless/wl12xx/Kconfig
+++ b/trunk/drivers/net/wireless/wl12xx/Kconfig
@@ -74,4 +74,7 @@ config WL1271_SDIO
 	  If you choose to build a module, it'll be called
 	  wl1271_sdio. Say N if unsure.
 
-
+config WL12XX_PLATFORM_DATA
+	bool
+	depends on WL1271_SDIO != n
+	default y
diff --git a/trunk/drivers/net/wireless/wl12xx/wl12xx_platform_data.c b/trunk/drivers/net/wireless/wl12xx/wl12xx_platform_data.c
new file mode 100644
index 000000000000..973b11060a8f
--- /dev/null
+++ b/trunk/drivers/net/wireless/wl12xx/wl12xx_platform_data.c
@@ -0,0 +1,28 @@
+#include <linux/module.h>
+#include <linux/err.h>
+#include <linux/wl12xx.h>
+
+static const struct wl12xx_platform_data *platform_data;
+
+int __init wl12xx_set_platform_data(const struct wl12xx_platform_data *data)
+{
+	if (platform_data)
+		return -EBUSY;
+	if (!data)
+		return -EINVAL;
+
+	platform_data = kmemdup(data, sizeof(*data), GFP_KERNEL);
+	if (!platform_data)
+		return -ENOMEM;
+
+	return 0;
+}
+
+const struct wl12xx_platform_data *wl12xx_get_platform_data(void)
+{
+	if (!platform_data)
+		return ERR_PTR(-ENODEV);
+
+	return platform_data;
+}
+EXPORT_SYMBOL(wl12xx_get_platform_data);
diff --git a/trunk/include/linux/wl12xx.h b/trunk/include/linux/wl12xx.h
index 015687a1776d..bd70563107fa 100644
--- a/trunk/include/linux/wl12xx.h
+++ b/trunk/include/linux/wl12xx.h
@@ -31,4 +31,7 @@ struct wl12xx_platform_data {
 	bool use_eeprom;
 };
 
+int wl12xx_set_platform_data(const struct wl12xx_platform_data *data);
+const struct wl12xx_platform_data *wl12xx_get_platform_data(void);
+
 #endif