diff options
| author |   Luciano Coelho <coelho@ti.com> | 2013-01-25 12:05:34 +0200 |
|---|---|---|
| committer | Luciano Coelho <coelho@ti.com> | 2013-02-08 10:05:02 +0200 |
| commit | 6cc9efed707c575a9e5880ea68f8b9d36b235f1f (patch) | |
| tree | 205ce4c92ece7ea5c3020b9ce12ca801e08642af /include/linux/wl12xx.h | |
| parent | wlcore: use PLATFORM_DEVID_AUTO for plat dev creation to avoid conflicts (diff) | |
| download | linux-dev-6cc9efed707c575a9e5880ea68f8b9d36b235f1f.tar.xz linux-dev-6cc9efed707c575a9e5880ea68f8b9d36b235f1f.zip | |
wlcore: move wl12xx_platform_data up and make it truly optional
The platform data is used not only by wlcore-based drivers, but also
by wl1251. Move it up in the directory hierarchy to reflect this.
Additionally, make it truly optional. At the moment, disabling
platform data while wl1251_sdio or wlcore_sdio are enabled doesn't
work, but it will be necessary when device tree support is
implemented.
Signed-off-by: Luciano Coelho <coelho@ti.com>
Reviewed-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'include/linux/wl12xx.h')
| -rw-r--r-- | include/linux/wl12xx.h | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/include/linux/wl12xx.h b/include/linux/wl12xx.h index 360c9bce665c..a54fe82e704b 100644 --- a/include/linux/wl12xx.h +++ b/include/linux/wl12xx.h @@ -24,6 +24,8 @@ #ifndef _LINUX_WL12XX_H #define _LINUX_WL12XX_H +#include <linux/err.h> + /* Reference clock values */ enum { WL12XX_REFCLOCK_19 = 0, /* 19.2 MHz */ @@ -60,10 +62,12 @@ struct wl12xx_platform_data { /* Platform does not support level trigger interrupts */ #define WL12XX_PLATFORM_QUIRK_EDGE_IRQ BIT(0) -#ifdef CONFIG_WL12XX_PLATFORM_DATA +#ifdef CONFIG_WILINK_PLATFORM_DATA int wl12xx_set_platform_data(const struct wl12xx_platform_data *data); +struct wl12xx_platform_data *wl12xx_get_platform_data(void); + #else static inline @@ -72,8 +76,12 @@ int wl12xx_set_platform_data(const struct wl12xx_platform_data *data) return -ENOSYS; } -#endif +static inline +struct wl12xx_platform_data *wl12xx_get_platform_data(void) +{ + return ERR_PTR(-ENODATA); +} -struct wl12xx_platform_data *wl12xx_get_platform_data(void); +#endif #endif |