[Meego-kernel] [PATCH 05/26] wl12xx: add platform data passing support

[Brouat, Claude]

>From e8a0c56221d93857291b8e48878ae53446d3d068 Mon Sep 17 00:00:00 2001
From: Ohad Ben-Cohen <ohad at wizery.com>
Date: Thu, 16 Sep 2010 01:31:12 +0200
Subject: [PATCH 05/26] 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.

Signed-off-by: Ohad Ben-Cohen <ohad at wizery.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
Signed-off-by: Claude Brouat <claude.brouat at intel.com>
---
 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

diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile
index 5d4ce4d..85af697 100644
--- a/drivers/net/wireless/Makefile
+++ b/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/drivers/net/wireless/wl12xx/Kconfig b/drivers/net/wireless/wl12xx/Kconfig
index 1516341..2efa585 100644
--- a/drivers/net/wireless/wl12xx/Kconfig
+++ b/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/drivers/net/wireless/wl12xx/wl12xx_platform_data.c b/drivers/net/wireless/wl12xx/wl12xx_platform_data.c
new file mode 100644
index 0000000..973b110
--- /dev/null
+++ b/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/include/linux/wl12xx.h b/include/linux/wl12xx.h
index 015687a..bd70563 100644
--- a/include/linux/wl12xx.h
+++ b/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
--
1.6.3.3



Claude BROUAT
UMG/MIPE/WSIV  System Integrator
Office:    +33 (0)1 72 21 04 54
mailto: mailto:claude.brouat at intel.com

Intel Corp. SAS
134, av du Général Eisenhower
BP 73586
31100 TOULOUSE
France



---------------------------------------------------------------------
Intel Corporation SAS (French simplified joint stock company)
Registered headquarters: "Les Montalets"- 2, rue de Paris, 
92196 Meudon Cedex, France
Registration Number:  302 456 199 R.C.S. NANTERRE
Capital: 4,572,000 Euros

This e-mail and any attachments may contain confidential material for
the sole use of the intended recipient(s). Any review or distribution
by others is strictly prohibited. If you are not the intended
recipient, please contact the sender and delete all copies.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.meego.com/pipermail/meego-kernel/attachments/20101020/f5cccbb5/attachment-0001.html>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0005-wl12xx-add-platform-data-passing-support.patch
Type: application/octet-stream
Size: 3134 bytes
Desc: 0005-wl12xx-add-platform-data-passing-support.patch
URL: <http://lists.meego.com/pipermail/meego-kernel/attachments/20101020/f5cccbb5/attachment-0001.obj>