rtl818x: move rtl8180 and rtl8187 to separate subdirectories
John W. Linville [Mon, 20 Dec 2010 20:16:53 +0000 (15:16 -0500)]
These drivers share one header file, but nothing else.  Worse, both
drivers use the rtl8225 part with different register settings.  The
results has been some ugly naming -- let's simplify that.

Signed-off-by: John W. Linville <linville@tuxdriver.com>
Acked-by: Hin-Tak Leung <htl10@users.sourceforge.net>
Acked-by: Larry Finger <Larry.Finger@lwfinger.net>
Acked-by: Herton Ronaldo Krzesinski <herton@mandriva.com.br>

22 files changed:
MAINTAINERS
drivers/net/wireless/rtl818x/Makefile
drivers/net/wireless/rtl818x/rtl8180/Makefile [new file with mode: 0644]
drivers/net/wireless/rtl818x/rtl8180/dev.c [moved from drivers/net/wireless/rtl818x/rtl8180_dev.c with 99% similarity]
drivers/net/wireless/rtl818x/rtl8180/grf5101.c [moved from drivers/net/wireless/rtl818x/rtl8180_grf5101.c with 99% similarity]
drivers/net/wireless/rtl818x/rtl8180/grf5101.h [moved from drivers/net/wireless/rtl818x/rtl8180_grf5101.h with 100% similarity]
drivers/net/wireless/rtl818x/rtl8180/max2820.c [moved from drivers/net/wireless/rtl818x/rtl8180_max2820.c with 99% similarity]
drivers/net/wireless/rtl818x/rtl8180/max2820.h [moved from drivers/net/wireless/rtl818x/rtl8180_max2820.h with 100% similarity]
drivers/net/wireless/rtl818x/rtl8180/rtl8180.h [moved from drivers/net/wireless/rtl818x/rtl8180.h with 100% similarity]
drivers/net/wireless/rtl818x/rtl8180/rtl8225.c [moved from drivers/net/wireless/rtl818x/rtl8180_rtl8225.c with 99% similarity]
drivers/net/wireless/rtl818x/rtl8180/rtl8225.h [moved from drivers/net/wireless/rtl818x/rtl8180_rtl8225.h with 100% similarity]
drivers/net/wireless/rtl818x/rtl8180/sa2400.c [moved from drivers/net/wireless/rtl818x/rtl8180_sa2400.c with 99% similarity]
drivers/net/wireless/rtl818x/rtl8180/sa2400.h [moved from drivers/net/wireless/rtl818x/rtl8180_sa2400.h with 100% similarity]
drivers/net/wireless/rtl818x/rtl8187/Makefile [new file with mode: 0644]
drivers/net/wireless/rtl818x/rtl8187/dev.c [moved from drivers/net/wireless/rtl818x/rtl8187_dev.c with 99% similarity]
drivers/net/wireless/rtl818x/rtl8187/leds.c [moved from drivers/net/wireless/rtl818x/rtl8187_leds.c with 99% similarity]
drivers/net/wireless/rtl818x/rtl8187/leds.h [moved from drivers/net/wireless/rtl818x/rtl8187_leds.h with 100% similarity]
drivers/net/wireless/rtl818x/rtl8187/rfkill.c [moved from drivers/net/wireless/rtl818x/rtl8187_rfkill.c with 98% similarity]
drivers/net/wireless/rtl818x/rtl8187/rfkill.h [moved from drivers/net/wireless/rtl818x/rtl8187_rfkill.h with 100% similarity]
drivers/net/wireless/rtl818x/rtl8187/rtl8187.h [moved from drivers/net/wireless/rtl818x/rtl8187.h with 99% similarity]
drivers/net/wireless/rtl818x/rtl8187/rtl8225.c [moved from drivers/net/wireless/rtl818x/rtl8187_rtl8225.c with 99% similarity]
drivers/net/wireless/rtl818x/rtl8187/rtl8225.h [moved from drivers/net/wireless/rtl818x/rtl8187_rtl8225.h with 100% similarity]

index 94c129f..ff19c30 100644 (file)
@@ -5032,7 +5032,7 @@ L:        linux-wireless@vger.kernel.org
 W:     http://linuxwireless.org/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git
 S:     Maintained
-F:     drivers/net/wireless/rtl818x/rtl8180*
+F:     drivers/net/wireless/rtl818x/rtl8180/
 
 RTL8187 WIRELESS DRIVER
 M:     Herton Ronaldo Krzesinski <herton@mandriva.com.br>
@@ -5042,7 +5042,7 @@ L:        linux-wireless@vger.kernel.org
 W:     http://linuxwireless.org/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git
 S:     Maintained
-F:     drivers/net/wireless/rtl818x/rtl8187*
+F:     drivers/net/wireless/rtl818x/rtl8187/
 
 RTL8192CE WIRELESS DRIVER
 M:     Larry Finger <Larry.Finger@lwfinger.net>
index 93cbfbe..9975690 100644 (file)
@@ -1,7 +1,2 @@
-rtl8180-objs           := rtl8180_dev.o rtl8180_rtl8225.o rtl8180_sa2400.o rtl8180_max2820.o rtl8180_grf5101.o
-rtl8187-objs           := rtl8187_dev.o rtl8187_rtl8225.o rtl8187_leds.o rtl8187_rfkill.o
-
-obj-$(CONFIG_RTL8180)  += rtl8180.o
-obj-$(CONFIG_RTL8187)  += rtl8187.o
-
-
+obj-$(CONFIG_RTL8180)  += rtl8180/
+obj-$(CONFIG_RTL8187)  += rtl8187/
diff --git a/drivers/net/wireless/rtl818x/rtl8180/Makefile b/drivers/net/wireless/rtl818x/rtl8180/Makefile
new file mode 100644 (file)
index 0000000..cb4fb85
--- /dev/null
@@ -0,0 +1,5 @@
+rtl8180-objs           := dev.o rtl8225.o sa2400.o max2820.o grf5101.o
+
+obj-$(CONFIG_RTL8180)  += rtl8180.o
+
+ccflags-y += -Idrivers/net/wireless/rtl818x
similarity index 99%
rename from drivers/net/wireless/rtl818x/rtl8180_dev.c
rename to drivers/net/wireless/rtl818x/rtl8180/dev.c
index 707c688..5851cbc 100644 (file)
 #include <net/mac80211.h>
 
 #include "rtl8180.h"
-#include "rtl8180_rtl8225.h"
-#include "rtl8180_sa2400.h"
-#include "rtl8180_max2820.h"
-#include "rtl8180_grf5101.h"
+#include "rtl8225.h"
+#include "sa2400.h"
+#include "max2820.h"
+#include "grf5101.h"
 
 MODULE_AUTHOR("Michael Wu <flamingice@sourmilk.net>");
 MODULE_AUTHOR("Andrea Merello <andreamrl@tiscali.it>");
@@ -25,7 +25,7 @@
 #include <net/mac80211.h>
 
 #include "rtl8180.h"
-#include "rtl8180_grf5101.h"
+#include "grf5101.h"
 
 static const int grf5101_encode[] = {
        0x0, 0x8, 0x4, 0xC,
@@ -24,7 +24,7 @@
 #include <net/mac80211.h>
 
 #include "rtl8180.h"
-#include "rtl8180_max2820.h"
+#include "max2820.h"
 
 static const u32 max2820_chan[] = {
        12, /* CH 1 */
@@ -21,7 +21,7 @@
 #include <net/mac80211.h>
 
 #include "rtl8180.h"
-#include "rtl8180_rtl8225.h"
+#include "rtl8225.h"
 
 static void rtl8225_write(struct ieee80211_hw *dev, u8 addr, u16 data)
 {
@@ -25,7 +25,7 @@
 #include <net/mac80211.h>
 
 #include "rtl8180.h"
-#include "rtl8180_sa2400.h"
+#include "sa2400.h"
 
 static const u32 sa2400_chan[] = {
        0x00096c, /* ch1 */
diff --git a/drivers/net/wireless/rtl818x/rtl8187/Makefile b/drivers/net/wireless/rtl818x/rtl8187/Makefile
new file mode 100644 (file)
index 0000000..7b62992
--- /dev/null
@@ -0,0 +1,5 @@
+rtl8187-objs           := dev.o rtl8225.o leds.o rfkill.o
+
+obj-$(CONFIG_RTL8187)  += rtl8187.o
+
+ccflags-y += -Idrivers/net/wireless/rtl818x
similarity index 99%
rename from drivers/net/wireless/rtl818x/rtl8187_dev.c
rename to drivers/net/wireless/rtl818x/rtl8187/dev.c
index eeee244..6b82cac 100644 (file)
 #include <net/mac80211.h>
 
 #include "rtl8187.h"
-#include "rtl8187_rtl8225.h"
+#include "rtl8225.h"
 #ifdef CONFIG_RTL8187_LEDS
-#include "rtl8187_leds.h"
+#include "leds.h"
 #endif
-#include "rtl8187_rfkill.h"
+#include "rfkill.h"
 
 MODULE_AUTHOR("Michael Wu <flamingice@sourmilk.net>");
 MODULE_AUTHOR("Andrea Merello <andreamrl@tiscali.it>");
similarity index 99%
rename from drivers/net/wireless/rtl818x/rtl8187_leds.c
rename to drivers/net/wireless/rtl818x/rtl8187/leds.c
index 4637337..2e0de2f 100644 (file)
@@ -20,7 +20,7 @@
 #include <linux/eeprom_93cx6.h>
 
 #include "rtl8187.h"
-#include "rtl8187_leds.h"
+#include "leds.h"
 
 static void led_turn_on(struct work_struct *work)
 {
@@ -18,7 +18,7 @@
 #include <net/mac80211.h>
 
 #include "rtl8187.h"
-#include "rtl8187_rfkill.h"
+#include "rfkill.h"
 
 static bool rtl8187_is_radio_enabled(struct rtl8187_priv *priv)
 {
similarity index 99%
rename from drivers/net/wireless/rtl818x/rtl8187.h
rename to drivers/net/wireless/rtl818x/rtl8187/rtl8187.h
index 9887816..0d7b142 100644 (file)
@@ -16,7 +16,7 @@
 #define RTL8187_H
 
 #include "rtl818x.h"
-#include "rtl8187_leds.h"
+#include "leds.h"
 
 #define RTL8187_EEPROM_TXPWR_BASE      0x05
 #define RTL8187_EEPROM_MAC_ADDR                0x07
@@ -21,7 +21,7 @@
 #include <net/mac80211.h>
 
 #include "rtl8187.h"
-#include "rtl8187_rtl8225.h"
+#include "rtl8225.h"
 
 static void rtl8225_write_bitbang(struct ieee80211_hw *dev, u8 addr, u16 data)
 {