Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[firefly-linux-kernel-4.4.55.git] / include / linux / wl12xx.h

diff --git a/include/linux/wl12xx.h b/include/linux/wl12xx.h
index a9c723be1acfca6cd6d6bbfa37f453404aadb83d..95704cd4cfab3ccee071c4a7765d433b1de99a14 100644 (file)
--- a/include/linux/wl12xx.h
+++ b/include/linux/wl12xx.h
@@ -26,28 +26,6 @@
 
 #include <linux/err.h>
 
-/* Reference clock values */
-enum {
-       WL12XX_REFCLOCK_19      = 0, /* 19.2 MHz */
-       WL12XX_REFCLOCK_26      = 1, /* 26 MHz */
-       WL12XX_REFCLOCK_38      = 2, /* 38.4 MHz */
-       WL12XX_REFCLOCK_52      = 3, /* 52 MHz */
-       WL12XX_REFCLOCK_38_XTAL = 4, /* 38.4 MHz, XTAL */
-       WL12XX_REFCLOCK_26_XTAL = 5, /* 26 MHz, XTAL */
-};
-
-/* TCXO clock values */
-enum {
-       WL12XX_TCXOCLOCK_19_2   = 0, /* 19.2MHz */
-       WL12XX_TCXOCLOCK_26     = 1, /* 26 MHz */
-       WL12XX_TCXOCLOCK_38_4   = 2, /* 38.4MHz */
-       WL12XX_TCXOCLOCK_52     = 3, /* 52 MHz */
-       WL12XX_TCXOCLOCK_16_368 = 4, /* 16.368 MHz */
-       WL12XX_TCXOCLOCK_32_736 = 5, /* 32.736 MHz */
-       WL12XX_TCXOCLOCK_16_8   = 6, /* 16.8 MHz */
-       WL12XX_TCXOCLOCK_33_6   = 7, /* 33.6 MHz */
-};
-
 struct wl1251_platform_data {
        int power_gpio;
        /* SDIO only: IRQ number if WLAN_IRQ line is used, 0 for SDIO IRQs */
@@ -55,41 +33,14 @@ struct wl1251_platform_data {
        bool use_eeprom;
 };
 
-struct wl12xx_platform_data {
-       int irq;
-       int board_ref_clock;
-       int board_tcxo_clock;
-       unsigned long platform_quirks;
-       bool pwr_in_suspend;
-};
-
-/* Platform does not support level trigger interrupts */
-#define WL12XX_PLATFORM_QUIRK_EDGE_IRQ BIT(0)
-
 #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);
-
 int wl1251_set_platform_data(const struct wl1251_platform_data *data);
 
 struct wl1251_platform_data *wl1251_get_platform_data(void);
 
 #else
 
-static inline
-int wl12xx_set_platform_data(const struct wl12xx_platform_data *data)
-{
-       return -ENOSYS;
-}
-
-static inline
-struct wl12xx_platform_data *wl12xx_get_platform_data(void)
-{
-       return ERR_PTR(-ENODATA);
-}
-
 static inline
 int wl1251_set_platform_data(const struct wl1251_platform_data *data)
 {