On Sat, Sep 04, 2010 at 02:23:19PM +0200, Michał Mirosław wrote:
> 2010/9/1 Ohad Ben-Cohen <ohad@xxxxxxxxxx>:
> > 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@xxxxxxxxxx>
> > ---
> > drivers/net/wireless/Makefile | 2 +
> > drivers/net/wireless/wl12xx/Kconfig | 5 ++-
> > drivers/net/wireless/wl12xx/wl12xx_platform_data.c | 31 ++++++++++++++++++++
> > include/linux/wl12xx.h | 3 ++
> > 4 files changed, 40 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 2f98058..4a8bb25 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..e00973b
> > --- /dev/null
> > +++ b/drivers/net/wireless/wl12xx/wl12xx_platform_data.c
> > @@ -0,0 +1,31 @@
> > +#include <linux/module.h>
> > +#include <linux/wl12xx.h>
> > +
> > +static 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;
> > +}
> > +
> > +int wl12xx_get_platform_data(struct wl12xx_platform_data *data)
> > +{
> > + if (!platform_data)
> > + return -ENODEV;
> > + if (!data)
> > + return -EINVAL;
> > +
> > + memcpy(data, platform_data, sizeof(*data));
> > +
> > + return 0;
> > +}
> > +EXPORT_SYMBOL(wl12xx_get_platform_data);
> > diff --git a/include/linux/wl12xx.h b/include/linux/wl12xx.h
> > index 137ac89..3e33ae1 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);
> > +int wl12xx_get_platform_data(struct wl12xx_platform_data *data);
> > +
> > #endif
>
> Why do you need all that copying? Isn't the data constant?
The first copy is to allow platforms to have their data marked with
__initdata. The second copy probably isn't necessary, but avoids
problems where the driver may decide to modify the platform data.
We could instead make wl12xx_get_platform_data() return a const pointer
to its own internal storage instead, or ERR pointers for the various
failure cases.
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
