cw1200: rename the cw1200 platform definition header

My previous patch just moved the file, but it also needed to be renamed
to conform to proper conventions.

Signed-off-by: Solomon Peachy <pizza@shaftnet.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/cw1200/cw1200_sdio.c b/drivers/net/wireless/cw1200/cw1200_sdio.c
index 4b3148e47ee7d8cfc379335a20c36f0202b5af8b..bb1f405315e46ebf63cb29aa165bf15f90650571 100644 (file)
--- a/drivers/net/wireless/cw1200/cw1200_sdio.c
+++ b/drivers/net/wireless/cw1200/cw1200_sdio.c
@@ -20,7 +20,7 @@
 
 #include "cw1200.h"
 #include "hwbus.h"
-#include <linux/platform_data/cw1200_platform.h>
+#include <linux/platform_data/net-cw1200.h>
 #include "hwio.h"
 
 MODULE_AUTHOR("Dmitry Tarnyagin <dmitry.tarnyagin@lockless.no>");

diff --git a/drivers/net/wireless/cw1200/cw1200_spi.c b/drivers/net/wireless/cw1200/cw1200_spi.c
index d8dc7c6bb96d8a768eb02654a2cb87f8e80a626c..e58f0a5bafa9cc8e04c2187535070a088aa45808 100644 (file)
--- a/drivers/net/wireless/cw1200/cw1200_spi.c
+++ b/drivers/net/wireless/cw1200/cw1200_spi.c
@@ -25,7 +25,7 @@
 
 #include "cw1200.h"
 #include "hwbus.h"
-#include <linux/platform_data/cw1200_platform.h>
+#include <linux/platform_data/net-cw1200.h>
 #include "hwio.h"
 
 MODULE_AUTHOR("Solomon Peachy <speachy@sagrad.com>");

diff --git a/include/linux/platform_data/cw1200_platform.h b/include/linux/platform_data/cw1200_platform.h
deleted file mode 100644 (file)
index c6fbc3c..0000000
--- a/include/linux/platform_data/cw1200_platform.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright (C) ST-Ericsson SA 2011
- *
- * Author: Dmitry Tarnyagin <dmitry.tarnyagin@stericsson.com>
- * License terms: GNU General Public License (GPL) version 2
- */
-
-#ifndef CW1200_PLAT_H_INCLUDED
-#define CW1200_PLAT_H_INCLUDED
-
-struct cw1200_platform_data_spi {
-       u8 spi_bits_per_word;           /* REQUIRED */
-       u16 ref_clk;                    /* REQUIRED (in KHz) */
-
-       /* All others are optional */
-       bool have_5ghz;
-       int reset;                     /* GPIO to RSTn signal (0 disables) */
-       int powerup;                   /* GPIO to POWERUP signal (0 disables) */
-       int (*power_ctrl)(const struct cw1200_platform_data_spi *pdata,
-                         bool enable); /* Control 3v3 / 1v8 supply */
-       int (*clk_ctrl)(const struct cw1200_platform_data_spi *pdata,
-                       bool enable); /* Control CLK32K */
-       const u8 *macaddr;  /* if NULL, use cw1200_mac_template module parameter */
-       const char *sdd_file;  /* if NULL, will use default for detected hw type */
-};
-
-struct cw1200_platform_data_sdio {
-       u16 ref_clk;                    /* REQUIRED (in KHz) */
-
-       /* All others are optional */
-       bool have_5ghz;
-       bool no_nptb;       /* SDIO hardware does not support non-power-of-2-blocksizes */
-       int reset;          /* GPIO to RSTn signal (0 disables) */
-       int powerup;        /* GPIO to POWERUP signal (0 disables) */
-       int irq;            /* IRQ line or 0 to use SDIO IRQ */
-       int (*power_ctrl)(const struct cw1200_platform_data_sdio *pdata,
-                         bool enable); /* Control 3v3 / 1v8 supply */
-       int (*clk_ctrl)(const struct cw1200_platform_data_sdio *pdata,
-                       bool enable); /* Control CLK32K */
-       const u8 *macaddr;  /* if NULL, use cw1200_mac_template module parameter */
-       const char *sdd_file;  /* if NULL, will use default for detected hw type */
-};
-
-
-/* An example of SPI support in your board setup file:
-
-   static struct cw1200_platform_data_spi cw1200_platform_data = {
-       .ref_clk = 38400,
-       .spi_bits_per_word = 16,
-       .reset = GPIO_RF_RESET,
-       .powerup = GPIO_RF_POWERUP,
-       .macaddr = wifi_mac_addr,
-       .sdd_file = "sdd_sagrad_1091_1098.bin",
-  };
-  static struct spi_board_info myboard_spi_devices[] __initdata = {
-       {
-               .modalias = "cw1200_wlan_spi",
-               .max_speed_hz = 52000000,
-               .bus_num = 0,
-               .irq = WIFI_IRQ,
-               .platform_data = &cw1200_platform_data,
-               .chip_select = 0,
-       },
-  };
-
- */
-
-/* An example of SDIO support in your board setup file:
-
-  static struct cw1200_platform_data_sdio my_cw1200_platform_data = {
-       .ref_clk = 38400,
-       .have_5ghz = false,
-       .sdd_file = "sdd_myplatform.bin",
-  };
-  cw1200_sdio_set_platform_data(&my_cw1200_platform_data);
-
- */
-
-void __init cw1200_sdio_set_platform_data(struct cw1200_platform_data_sdio *pdata);
-
-#endif /* CW1200_PLAT_H_INCLUDED */

diff --git a/include/linux/platform_data/net-cw1200.h b/include/linux/platform_data/net-cw1200.h
new file mode 100644 (file)
index 0000000..c6fbc3c
--- /dev/null
+++ b/include/linux/platform_data/net-cw1200.h
@@ -0,0 +1,81 @@
+/*
+ * Copyright (C) ST-Ericsson SA 2011
+ *
+ * Author: Dmitry Tarnyagin <dmitry.tarnyagin@stericsson.com>
+ * License terms: GNU General Public License (GPL) version 2
+ */
+
+#ifndef CW1200_PLAT_H_INCLUDED
+#define CW1200_PLAT_H_INCLUDED
+
+struct cw1200_platform_data_spi {
+       u8 spi_bits_per_word;           /* REQUIRED */
+       u16 ref_clk;                    /* REQUIRED (in KHz) */
+
+       /* All others are optional */
+       bool have_5ghz;
+       int reset;                     /* GPIO to RSTn signal (0 disables) */
+       int powerup;                   /* GPIO to POWERUP signal (0 disables) */
+       int (*power_ctrl)(const struct cw1200_platform_data_spi *pdata,
+                         bool enable); /* Control 3v3 / 1v8 supply */
+       int (*clk_ctrl)(const struct cw1200_platform_data_spi *pdata,
+                       bool enable); /* Control CLK32K */
+       const u8 *macaddr;  /* if NULL, use cw1200_mac_template module parameter */
+       const char *sdd_file;  /* if NULL, will use default for detected hw type */
+};
+
+struct cw1200_platform_data_sdio {
+       u16 ref_clk;                    /* REQUIRED (in KHz) */
+
+       /* All others are optional */
+       bool have_5ghz;
+       bool no_nptb;       /* SDIO hardware does not support non-power-of-2-blocksizes */
+       int reset;          /* GPIO to RSTn signal (0 disables) */
+       int powerup;        /* GPIO to POWERUP signal (0 disables) */
+       int irq;            /* IRQ line or 0 to use SDIO IRQ */
+       int (*power_ctrl)(const struct cw1200_platform_data_sdio *pdata,
+                         bool enable); /* Control 3v3 / 1v8 supply */
+       int (*clk_ctrl)(const struct cw1200_platform_data_sdio *pdata,
+                       bool enable); /* Control CLK32K */
+       const u8 *macaddr;  /* if NULL, use cw1200_mac_template module parameter */
+       const char *sdd_file;  /* if NULL, will use default for detected hw type */
+};
+
+
+/* An example of SPI support in your board setup file:
+
+   static struct cw1200_platform_data_spi cw1200_platform_data = {
+       .ref_clk = 38400,
+       .spi_bits_per_word = 16,
+       .reset = GPIO_RF_RESET,
+       .powerup = GPIO_RF_POWERUP,
+       .macaddr = wifi_mac_addr,
+       .sdd_file = "sdd_sagrad_1091_1098.bin",
+  };
+  static struct spi_board_info myboard_spi_devices[] __initdata = {
+       {
+               .modalias = "cw1200_wlan_spi",
+               .max_speed_hz = 52000000,
+               .bus_num = 0,
+               .irq = WIFI_IRQ,
+               .platform_data = &cw1200_platform_data,
+               .chip_select = 0,
+       },
+  };
+
+ */
+
+/* An example of SDIO support in your board setup file:
+
+  static struct cw1200_platform_data_sdio my_cw1200_platform_data = {
+       .ref_clk = 38400,
+       .have_5ghz = false,
+       .sdd_file = "sdd_myplatform.bin",
+  };
+  cw1200_sdio_set_platform_data(&my_cw1200_platform_data);
+
+ */
+
+void __init cw1200_sdio_set_platform_data(struct cw1200_platform_data_sdio *pdata);
+
+#endif /* CW1200_PLAT_H_INCLUDED */