Skip to contentSkip to conversation

wl12xx: add platform data passing support

PATCH Superseded Ohad Ben-Cohen 2 participants 2 messages Sep 15, 2010 – Sep 21, 2010 Networking drivers (wireless)

lore
Share & tools
lore
#0 lore raw

PATCH v6 3/7 wl12xx: add platform data passing support

Add a simple mechanism to pass platform data to the SDIO instances of wl12xx.

This way there is no confusion over who owns the 'embedded data', typechecking is preserved, and no possibility for the wrong driver to pick up the data.

Originally proposed by Russell King.

---
 drivers/net/wireless/Makefile                      |    2 +
 drivers/net/wireless/wl12xx/Kconfig                |    5 +++-
 drivers/net/wireless/wl12xx/wl12xx_platform_data.c |   28 ++++++++++++++++++++
 include/linux/wl12xx.h                             |    3 ++
 4 files changed, 37 insertions(+), 1 deletions(-)
 create mode 100644 drivers/net/wireless/wl12xx/wl12xx_platform_data.c
drivers/net/wireless/Makefile +2 -0
index 5d4ce4d..85af697 100644
@@ -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/
drivers/net/wireless/wl12xx/Kconfig +4 -1
index 2f98058..4a8bb25 100644
@@ -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
drivers/net/wireless/wl12xx/wl12xx_platform_data.c new file +28 -0
new file mode 100644
index 0000000..973b110
@@ -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);
include/linux/wl12xx.h +3 -0
index 015687a..bd70563 100644
@@ -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
Signature · 1 line
1.7.0.4
#1 lore raw

PATCH v6 3/7 wl12xx: add platform data passing support

Quoted 11 lines · ext Ohad Ben-Cohen

Add a simple mechanism to pass platform data to the SDIO instances of wl12xx.

This way there is no confusion over who owns the 'embedded data', typechecking is preserved, and no possibility for the wrong driver to pick up the data.

Originally proposed by Russell King.

---

drivers/net/wireless/Makefile obj-$(CONFIG_ATH_COMMON) += ath/ · line 56

Quoted 12 lines
drivers/net/wireless/Makefile +2 -0
index 5d4ce4d..85af697 100644
@@ -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/

I guess this part should be acked by John Linville as well, since it adds something to the generic wireless driver object. John?

Signature · 2 lines
Cheers,
Luca.