rtl8192ce: drop 'rtl8192c-' prefix from files

Signed-off-by: John W. Linville <linville@tuxdriver.com>
Tested-by: Larry Finger <Larry.Finger@lwfinger.net>

diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/Makefile b/drivers/net/wireless/rtlwifi/rtl8192ce/Makefile
index f3d7682ff08ccc682c5101b2e75c0678c7d2d361..0f0be7c763b8274ec2a00cd4e8704932fbfe3ca9 100644 (file)
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/Makefile
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/Makefile
@@ -1,12 +1,12 @@
 rtl8192ce-objs :=              \
-       rtl8192c-dm.o           \
-       rtl8192c-fw.o           \
-       rtl8192c-hw.o           \
-       rtl8192c-led.o          \
-       rtl8192c-phy.o          \
-       rtl8192c-rf.o           \
-       rtl8192c-sw.o           \
-       rtl8192c-table.o        \
-       rtl8192c-trx.o
+               dm.o            \
+               fw.o            \
+               hw.o            \
+               led.o           \
+               phy.o           \
+               rf.o            \
+               sw.o            \
+               table.o         \
+               trx.o
 
 obj-$(CONFIG_RTL8192CE) += rtl8192ce.o

diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/rtl8192c-def.h b/drivers/net/wireless/rtlwifi/rtl8192ce/def.h
similarity index 100%
rename from drivers/net/wireless/rtlwifi/rtl8192ce/rtl8192c-def.h
rename to drivers/net/wireless/rtlwifi/rtl8192ce/def.h

diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/rtl8192c-dm.c b/drivers/net/wireless/rtlwifi/rtl8192ce/dm.c
similarity index 99%
rename from drivers/net/wireless/rtlwifi/rtl8192ce/rtl8192c-dm.c
rename to drivers/net/wireless/rtlwifi/rtl8192ce/dm.c
index 4896899394a846cdaf0c4859ecada096d9990c43..62e7c64e087b52ad9a7b756a1bff3e57afda6001 100644 (file)
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/rtl8192c-dm.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/dm.c
@@ -29,11 +29,11 @@
 
 #include "../wifi.h"
 #include "../base.h"
-#include "rtl8192c-reg.h"
-#include "rtl8192c-def.h"
-#include "rtl8192c-phy.h"
-#include "rtl8192c-dm.h"
-#include "rtl8192c-fw.h"
+#include "reg.h"
+#include "def.h"
+#include "phy.h"
+#include "dm.h"
+#include "fw.h"
 
 struct dig_t dm_digtable;
 static struct ps_t dm_pstable;

diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/rtl8192c-dm.h b/drivers/net/wireless/rtlwifi/rtl8192ce/dm.h
similarity index 100%
rename from drivers/net/wireless/rtlwifi/rtl8192ce/rtl8192c-dm.h
rename to drivers/net/wireless/rtlwifi/rtl8192ce/dm.h

diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/rtl8192c-fw.c b/drivers/net/wireless/rtlwifi/rtl8192ce/fw.c
similarity index 99%
rename from drivers/net/wireless/rtlwifi/rtl8192ce/rtl8192c-fw.c
rename to drivers/net/wireless/rtlwifi/rtl8192ce/fw.c
index 80ee6ff9d2b8aac2e3cac060ee5abe614b0376d7..11dd22b987e727e0fb401625c5ece7a279f644c4 100644 (file)
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/rtl8192c-fw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/fw.c
@@ -31,10 +31,10 @@
 #include "../wifi.h"
 #include "../pci.h"
 #include "../base.h"
-#include "rtl8192c-reg.h"
-#include "rtl8192c-def.h"
-#include "rtl8192c-fw.h"
-#include "rtl8192c-table.h"
+#include "reg.h"
+#include "def.h"
+#include "fw.h"
+#include "table.h"
 
 static void _rtl92c_enable_fw_download(struct ieee80211_hw *hw, bool enable)
 {

diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/rtl8192c-fw.h b/drivers/net/wireless/rtlwifi/rtl8192ce/fw.h
similarity index 100%
rename from drivers/net/wireless/rtlwifi/rtl8192ce/rtl8192c-fw.h
rename to drivers/net/wireless/rtlwifi/rtl8192ce/fw.h

diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/rtl8192c-hw.c b/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c
similarity index 99%
rename from drivers/net/wireless/rtlwifi/rtl8192ce/rtl8192c-hw.c
rename to drivers/net/wireless/rtlwifi/rtl8192ce/hw.c
index c649f65557527fba392b6a1c35d243ec7b0f13dc..1266dbe44176d497272d9f53f8291442e445f5f3 100644 (file)
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/rtl8192c-hw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c
@@ -33,13 +33,13 @@
 #include "../cam.h"
 #include "../ps.h"
 #include "../pci.h"
-#include "rtl8192c-reg.h"
-#include "rtl8192c-def.h"
-#include "rtl8192c-phy.h"
-#include "rtl8192c-dm.h"
-#include "rtl8192c-fw.h"
-#include "rtl8192c-led.h"
-#include "rtl8192c-hw.h"
+#include "reg.h"
+#include "def.h"
+#include "phy.h"
+#include "dm.h"
+#include "fw.h"
+#include "led.h"
+#include "hw.h"
 
 #define LLT_CONFIG     5
 

diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/rtl8192c-hw.h b/drivers/net/wireless/rtlwifi/rtl8192ce/hw.h
similarity index 100%
rename from drivers/net/wireless/rtlwifi/rtl8192ce/rtl8192c-hw.h
rename to drivers/net/wireless/rtlwifi/rtl8192ce/hw.h

diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/rtl8192c-led.c b/drivers/net/wireless/rtlwifi/rtl8192ce/led.c
similarity index 98%
rename from drivers/net/wireless/rtlwifi/rtl8192ce/rtl8192c-led.c
rename to drivers/net/wireless/rtlwifi/rtl8192ce/led.c
index 6091084215709049bed7d98149b1fc6d58f46b4a..78a0569208eada11cc342070998bf4b26b46694d 100644 (file)
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/rtl8192c-led.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/led.c
@@ -29,8 +29,8 @@
 
 #include "../wifi.h"
 #include "../pci.h"
-#include "rtl8192c-reg.h"
-#include "rtl8192c-led.h"
+#include "reg.h"
+#include "led.h"
 
 void rtl92ce_sw_led_on(struct ieee80211_hw *hw, struct rtl_led *pled)
 {

diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/rtl8192c-led.h b/drivers/net/wireless/rtlwifi/rtl8192ce/led.h
similarity index 100%
rename from drivers/net/wireless/rtlwifi/rtl8192ce/rtl8192c-led.h
rename to drivers/net/wireless/rtlwifi/rtl8192ce/led.h

diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/rtl8192c-phy.c b/drivers/net/wireless/rtlwifi/rtl8192ce/phy.c
similarity index 99%
rename from drivers/net/wireless/rtlwifi/rtl8192ce/rtl8192c-phy.c
rename to drivers/net/wireless/rtlwifi/rtl8192ce/phy.c
index 13d7b387a96a5c4f7c9c06e06ddacf41e538d899..45044117139a779de9f16f6dacc80041576cb482 100644 (file)
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/rtl8192c-phy.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/phy.c
@@ -30,12 +30,12 @@
 #include "../wifi.h"
 #include "../pci.h"
 #include "../ps.h"
-#include "rtl8192c-reg.h"
-#include "rtl8192c-def.h"
-#include "rtl8192c-phy.h"
-#include "rtl8192c-rf.h"
-#include "rtl8192c-dm.h"
-#include "rtl8192c-table.h"
+#include "reg.h"
+#include "def.h"
+#include "phy.h"
+#include "rf.h"
+#include "dm.h"
+#include "table.h"
 
 static u32 _rtl92c_phy_fw_rf_serial_read(struct ieee80211_hw *hw,
                                         enum radio_path rfpath, u32 offset);

diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/rtl8192c-phy.h b/drivers/net/wireless/rtlwifi/rtl8192ce/phy.h
similarity index 100%
rename from drivers/net/wireless/rtlwifi/rtl8192ce/rtl8192c-phy.h
rename to drivers/net/wireless/rtlwifi/rtl8192ce/phy.h

diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/rtl8192c-reg.h b/drivers/net/wireless/rtlwifi/rtl8192ce/reg.h
similarity index 100%
rename from drivers/net/wireless/rtlwifi/rtl8192ce/rtl8192c-reg.h
rename to drivers/net/wireless/rtlwifi/rtl8192ce/reg.h

diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/rtl8192c-rf.c b/drivers/net/wireless/rtlwifi/rtl8192ce/rf.c
similarity index 99%
rename from drivers/net/wireless/rtlwifi/rtl8192ce/rtl8192c-rf.c
rename to drivers/net/wireless/rtlwifi/rtl8192ce/rf.c
index a2d58df5d3a000b2544c0171b8931f9b2a7678de..ffd8e04c40287d48619fddcfd44240e6f3a24053 100644 (file)
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/rtl8192c-rf.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/rf.c
@@ -28,11 +28,11 @@
  *****************************************************************************/
 
 #include "../wifi.h"
-#include "rtl8192c-reg.h"
-#include "rtl8192c-def.h"
-#include "rtl8192c-phy.h"
-#include "rtl8192c-rf.h"
-#include "rtl8192c-dm.h"
+#include "reg.h"
+#include "def.h"
+#include "phy.h"
+#include "rf.h"
+#include "dm.h"
 
 static bool _rtl92c_phy_rf6052_config_parafile(struct ieee80211_hw *hw);
 

diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/rtl8192c-rf.h b/drivers/net/wireless/rtlwifi/rtl8192ce/rf.h
similarity index 100%
rename from drivers/net/wireless/rtlwifi/rtl8192ce/rtl8192c-rf.h
rename to drivers/net/wireless/rtlwifi/rtl8192ce/rf.h

diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/rtl8192c-sw.c b/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c
similarity index 97%
rename from drivers/net/wireless/rtlwifi/rtl8192ce/rtl8192c-sw.c
rename to drivers/net/wireless/rtlwifi/rtl8192ce/sw.c
index 4c76ad6401be117db0f872ef0d85e3f6cf453e68..b366e8862929047fd9442ee2b0173ab9a3722344 100644 (file)
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/rtl8192c-sw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c
@@ -32,14 +32,14 @@
 #include "../wifi.h"
 #include "../core.h"
 #include "../pci.h"
-#include "rtl8192c-reg.h"
-#include "rtl8192c-def.h"
-#include "rtl8192c-phy.h"
-#include "rtl8192c-dm.h"
-#include "rtl8192c-hw.h"
-#include "rtl8192c-sw.h"
-#include "rtl8192c-trx.h"
-#include "rtl8192c-led.h"
+#include "reg.h"
+#include "def.h"
+#include "phy.h"
+#include "dm.h"
+#include "hw.h"
+#include "sw.h"
+#include "trx.h"
+#include "led.h"
 
 int rtl92c_init_sw_vars(struct ieee80211_hw *hw)
 {

diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/rtl8192c-sw.h b/drivers/net/wireless/rtlwifi/rtl8192ce/sw.h
similarity index 100%
rename from drivers/net/wireless/rtlwifi/rtl8192ce/rtl8192c-sw.h
rename to drivers/net/wireless/rtlwifi/rtl8192ce/sw.h

diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/rtl8192c-table.c b/drivers/net/wireless/rtlwifi/rtl8192ce/table.c
similarity index 99%
rename from drivers/net/wireless/rtlwifi/rtl8192ce/rtl8192c-table.c
rename to drivers/net/wireless/rtlwifi/rtl8192ce/table.c
index 2a9bbbe691a4e4cd71f67561f26e2efe9d7a0372..ba938b91aa6f3d9d506b6f67b984f42e41797ab8 100644 (file)
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/rtl8192c-table.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/table.c
@@ -29,7 +29,7 @@
  *
  *****************************************************************************/
 
-#include "rtl8192c-table.h"
+#include "table.h"
 
 
 u32 RTL8192CEPHY_REG_2TARRAY[PHY_REG_2TARRAY_LENGTH] = {

diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/rtl8192c-table.h b/drivers/net/wireless/rtlwifi/rtl8192ce/table.h
similarity index 100%
rename from drivers/net/wireless/rtlwifi/rtl8192ce/rtl8192c-table.h
rename to drivers/net/wireless/rtlwifi/rtl8192ce/table.h

diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/rtl8192c-trx.c b/drivers/net/wireless/rtlwifi/rtl8192ce/trx.c
similarity index 99%
rename from drivers/net/wireless/rtlwifi/rtl8192ce/rtl8192c-trx.c
rename to drivers/net/wireless/rtlwifi/rtl8192ce/trx.c
index cf35418c8afe05edf5cc85c98d4a0a064953269e..bf5852f2d634ca0fc0445e8d005a1cf393833c58 100644 (file)
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/rtl8192c-trx.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/trx.c
@@ -30,11 +30,11 @@
 #include "../wifi.h"
 #include "../pci.h"
 #include "../base.h"
-#include "rtl8192c-reg.h"
-#include "rtl8192c-def.h"
-#include "rtl8192c-phy.h"
-#include "rtl8192c-trx.h"
-#include "rtl8192c-led.h"
+#include "reg.h"
+#include "def.h"
+#include "phy.h"
+#include "trx.h"
+#include "led.h"
 
 static enum rtl_desc_qsel _rtl92ce_map_hwqueue_to_fwqueue(u16 fc,
                                                          unsigned int

diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/rtl8192c-trx.h b/drivers/net/wireless/rtlwifi/rtl8192ce/trx.h
similarity index 100%
rename from drivers/net/wireless/rtlwifi/rtl8192ce/rtl8192c-trx.h
rename to drivers/net/wireless/rtlwifi/rtl8192ce/trx.h