Linux-Wireless Archive mirror
 help / color / mirror / Atom feed
* [PATCH 1/2] wifi: rtl8xxxu: remove some unused includes
@ 2024-04-26 14:19 Kalle Valo
  2024-04-26 14:19 ` [PATCH 2/2] wifi: rtl8xxxu: remove rtl8xxxu_ prefix from filenames Kalle Valo
                   ` (3 more replies)
  0 siblings, 4 replies; 7+ messages in thread
From: Kalle Valo @ 2024-04-26 14:19 UTC (permalink / raw
  To: pkshih; +Cc: linux-wireless

I noticed by random that rtl8xxxu includes linux/wireless.h even though it
doesn't need it. While investigating a bit more I found even more unused
include files:

#include <linux/init.h>
#include <linux/sched.h>
#include <linux/ethtool.h>

It looks like that the includes are just copied to every file without checking
if the file really needs the include. So more includes could be removed but
that would need more careful analysis per each file.

No functional changes, compile tested only.

Signed-off-by: Kalle Valo <kvalo@kernel.org>
---
 drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c | 4 ----
 drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188f.c | 4 ----
 drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192c.c | 4 ----
 drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c | 4 ----
 drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192f.c | 4 ----
 drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8710b.c | 4 ----
 drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723a.c | 4 ----
 drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c | 4 ----
 drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c  | 4 ----
 9 files changed, 36 deletions(-)

diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c
index afe9cc1b49dc..43735ca70b7c 100644
--- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c
+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c
@@ -13,9 +13,7 @@
  * additional 8xxx chips like the 8192cu, 8188cus, etc.
  */
 
-#include <linux/init.h>
 #include <linux/kernel.h>
-#include <linux/sched.h>
 #include <linux/errno.h>
 #include <linux/slab.h>
 #include <linux/module.h>
@@ -24,8 +22,6 @@
 #include <linux/usb.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
-#include <linux/ethtool.h>
-#include <linux/wireless.h>
 #include <linux/firmware.h>
 #include <linux/moduleparam.h>
 #include <net/mac80211.h>
diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188f.c b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188f.c
index 464216d007ce..9043e548518f 100644
--- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188f.c
+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188f.c
@@ -11,9 +11,7 @@
  * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved.
  */
 
-#include <linux/init.h>
 #include <linux/kernel.h>
-#include <linux/sched.h>
 #include <linux/errno.h>
 #include <linux/slab.h>
 #include <linux/module.h>
@@ -22,8 +20,6 @@
 #include <linux/usb.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
-#include <linux/ethtool.h>
-#include <linux/wireless.h>
 #include <linux/firmware.h>
 #include <linux/moduleparam.h>
 #include <net/mac80211.h>
diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192c.c b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192c.c
index ddf2d9707338..49eb1d0a6019 100644
--- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192c.c
+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192c.c
@@ -13,9 +13,7 @@
  * additional 8xxx chips like the 8192cu, 8188cus, etc.
  */
 
-#include <linux/init.h>
 #include <linux/kernel.h>
-#include <linux/sched.h>
 #include <linux/errno.h>
 #include <linux/slab.h>
 #include <linux/module.h>
@@ -24,8 +22,6 @@
 #include <linux/usb.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
-#include <linux/ethtool.h>
-#include <linux/wireless.h>
 #include <linux/firmware.h>
 #include <linux/moduleparam.h>
 #include <net/mac80211.h>
diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c
index 63b73ace27ec..26132b6b9331 100644
--- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c
+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c
@@ -13,9 +13,7 @@
  * additional 8xxx chips like the 8192cu, 8188cus, etc.
  */
 
-#include <linux/init.h>
 #include <linux/kernel.h>
-#include <linux/sched.h>
 #include <linux/errno.h>
 #include <linux/slab.h>
 #include <linux/module.h>
@@ -24,8 +22,6 @@
 #include <linux/usb.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
-#include <linux/ethtool.h>
-#include <linux/wireless.h>
 #include <linux/firmware.h>
 #include <linux/moduleparam.h>
 #include <net/mac80211.h>
diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192f.c b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192f.c
index 21e4204769d0..9f1d4a6ee210 100644
--- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192f.c
+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192f.c
@@ -11,9 +11,7 @@
  * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved.
  */
 
-#include <linux/init.h>
 #include <linux/kernel.h>
-#include <linux/sched.h>
 #include <linux/errno.h>
 #include <linux/slab.h>
 #include <linux/module.h>
@@ -22,8 +20,6 @@
 #include <linux/usb.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
-#include <linux/ethtool.h>
-#include <linux/wireless.h>
 #include <linux/firmware.h>
 #include <linux/moduleparam.h>
 #include <net/mac80211.h>
diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8710b.c b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8710b.c
index 46d57510e9fc..aa27ac4f828b 100644
--- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8710b.c
+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8710b.c
@@ -11,9 +11,7 @@
  * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved.
  */
 
-#include <linux/init.h>
 #include <linux/kernel.h>
-#include <linux/sched.h>
 #include <linux/errno.h>
 #include <linux/slab.h>
 #include <linux/module.h>
@@ -22,8 +20,6 @@
 #include <linux/usb.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
-#include <linux/ethtool.h>
-#include <linux/wireless.h>
 #include <linux/firmware.h>
 #include <linux/moduleparam.h>
 #include <net/mac80211.h>
diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723a.c b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723a.c
index bf8c34af781f..965c8c3662a6 100644
--- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723a.c
+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723a.c
@@ -13,9 +13,7 @@
  * additional 8xxx chips like the 8192cu, 8188cus, etc.
  */
 
-#include <linux/init.h>
 #include <linux/kernel.h>
-#include <linux/sched.h>
 #include <linux/errno.h>
 #include <linux/slab.h>
 #include <linux/module.h>
@@ -24,8 +22,6 @@
 #include <linux/usb.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
-#include <linux/ethtool.h>
-#include <linux/wireless.h>
 #include <linux/firmware.h>
 #include <linux/moduleparam.h>
 #include <net/mac80211.h>
diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c
index 6653f43973cf..3355d8e97870 100644
--- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c
+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c
@@ -13,9 +13,7 @@
  * additional 8xxx chips like the 8192cu, 8188cus, etc.
  */
 
-#include <linux/init.h>
 #include <linux/kernel.h>
-#include <linux/sched.h>
 #include <linux/errno.h>
 #include <linux/slab.h>
 #include <linux/module.h>
@@ -24,8 +22,6 @@
 #include <linux/usb.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
-#include <linux/ethtool.h>
-#include <linux/wireless.h>
 #include <linux/firmware.h>
 #include <linux/moduleparam.h>
 #include <net/mac80211.h>
diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
index e72f35a40ab3..54f955b01475 100644
--- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
@@ -13,9 +13,7 @@
  * additional 8xxx chips like the 8192cu, 8188cus, etc.
  */
 
-#include <linux/init.h>
 #include <linux/kernel.h>
-#include <linux/sched.h>
 #include <linux/errno.h>
 #include <linux/slab.h>
 #include <linux/module.h>
@@ -24,8 +22,6 @@
 #include <linux/usb.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
-#include <linux/ethtool.h>
-#include <linux/wireless.h>
 #include <linux/firmware.h>
 #include <linux/moduleparam.h>
 #include <net/mac80211.h>

base-commit: 4ea11e4db3550ee655b411b43498552e8c6ead01
-- 
2.39.2


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [PATCH 2/2] wifi: rtl8xxxu: remove rtl8xxxu_ prefix from filenames
  2024-04-26 14:19 [PATCH 1/2] wifi: rtl8xxxu: remove some unused includes Kalle Valo
@ 2024-04-26 14:19 ` Kalle Valo
  2024-04-29  2:08   ` Ping-Ke Shih
  2024-04-29  2:08 ` [PATCH 1/2] wifi: rtl8xxxu: remove some unused includes Ping-Ke Shih
                   ` (2 subsequent siblings)
  3 siblings, 1 reply; 7+ messages in thread
From: Kalle Valo @ 2024-04-26 14:19 UTC (permalink / raw
  To: pkshih; +Cc: linux-wireless

The driver is already in a directory named rtl8xxxu, there's no need to
duplicate that in the filename as well. Now file listing looks a lot more
reasonable:

8188e.c  8192c.c  8192f.c  8723a.c  core.c   Makefile  rtl8xxxu.h
8188f.c  8192e.c  8710b.c  8723b.c  Kconfig  regs.h

No functional changes, compile tested only.

Signed-off-by: Kalle Valo <kvalo@kernel.org>
---
 .../wireless/realtek/rtl8xxxu/{rtl8xxxu_8188e.c => 8188e.c} | 2 +-
 .../wireless/realtek/rtl8xxxu/{rtl8xxxu_8188f.c => 8188f.c} | 2 +-
 .../wireless/realtek/rtl8xxxu/{rtl8xxxu_8192c.c => 8192c.c} | 2 +-
 .../wireless/realtek/rtl8xxxu/{rtl8xxxu_8192e.c => 8192e.c} | 2 +-
 .../wireless/realtek/rtl8xxxu/{rtl8xxxu_8192f.c => 8192f.c} | 2 +-
 .../wireless/realtek/rtl8xxxu/{rtl8xxxu_8710b.c => 8710b.c} | 2 +-
 .../wireless/realtek/rtl8xxxu/{rtl8xxxu_8723a.c => 8723a.c} | 2 +-
 .../wireless/realtek/rtl8xxxu/{rtl8xxxu_8723b.c => 8723b.c} | 2 +-
 drivers/net/wireless/realtek/rtl8xxxu/Makefile              | 6 +++---
 .../wireless/realtek/rtl8xxxu/{rtl8xxxu_core.c => core.c}   | 2 +-
 .../wireless/realtek/rtl8xxxu/{rtl8xxxu_regs.h => regs.h}   | 0
 11 files changed, 12 insertions(+), 12 deletions(-)
 rename drivers/net/wireless/realtek/rtl8xxxu/{rtl8xxxu_8188e.c => 8188e.c} (99%)
 rename drivers/net/wireless/realtek/rtl8xxxu/{rtl8xxxu_8188f.c => 8188f.c} (99%)
 rename drivers/net/wireless/realtek/rtl8xxxu/{rtl8xxxu_8192c.c => 8192c.c} (99%)
 rename drivers/net/wireless/realtek/rtl8xxxu/{rtl8xxxu_8192e.c => 8192e.c} (99%)
 rename drivers/net/wireless/realtek/rtl8xxxu/{rtl8xxxu_8192f.c => 8192f.c} (99%)
 rename drivers/net/wireless/realtek/rtl8xxxu/{rtl8xxxu_8710b.c => 8710b.c} (99%)
 rename drivers/net/wireless/realtek/rtl8xxxu/{rtl8xxxu_8723a.c => 8723a.c} (99%)
 rename drivers/net/wireless/realtek/rtl8xxxu/{rtl8xxxu_8723b.c => 8723b.c} (99%)
 rename drivers/net/wireless/realtek/rtl8xxxu/{rtl8xxxu_core.c => core.c} (99%)
 rename drivers/net/wireless/realtek/rtl8xxxu/{rtl8xxxu_regs.h => regs.h} (100%)

diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c b/drivers/net/wireless/realtek/rtl8xxxu/8188e.c
similarity index 99%
rename from drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c
rename to drivers/net/wireless/realtek/rtl8xxxu/8188e.c
index 43735ca70b7c..60fb0bffd4ed 100644
--- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c
+++ b/drivers/net/wireless/realtek/rtl8xxxu/8188e.c
@@ -26,7 +26,7 @@
 #include <linux/moduleparam.h>
 #include <net/mac80211.h>
 #include "rtl8xxxu.h"
-#include "rtl8xxxu_regs.h"
+#include "regs.h"
 
 static const struct rtl8xxxu_reg8val rtl8188e_mac_init_table[] = {
 	{0x026, 0x41}, {0x027, 0x35}, {0x040, 0x00}, {0x421, 0x0f},
diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188f.c b/drivers/net/wireless/realtek/rtl8xxxu/8188f.c
similarity index 99%
rename from drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188f.c
rename to drivers/net/wireless/realtek/rtl8xxxu/8188f.c
index 9043e548518f..296370414134 100644
--- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188f.c
+++ b/drivers/net/wireless/realtek/rtl8xxxu/8188f.c
@@ -24,7 +24,7 @@
 #include <linux/moduleparam.h>
 #include <net/mac80211.h>
 #include "rtl8xxxu.h"
-#include "rtl8xxxu_regs.h"
+#include "regs.h"
 
 static const struct rtl8xxxu_reg8val rtl8188f_mac_init_table[] = {
 	{0x024, 0xDF}, {0x025, 0x07}, {0x02B, 0x1C}, {0x283, 0x20},
diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192c.c b/drivers/net/wireless/realtek/rtl8xxxu/8192c.c
similarity index 99%
rename from drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192c.c
rename to drivers/net/wireless/realtek/rtl8xxxu/8192c.c
index 49eb1d0a6019..b1c5a9971617 100644
--- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192c.c
+++ b/drivers/net/wireless/realtek/rtl8xxxu/8192c.c
@@ -26,7 +26,7 @@
 #include <linux/moduleparam.h>
 #include <net/mac80211.h>
 #include "rtl8xxxu.h"
-#include "rtl8xxxu_regs.h"
+#include "regs.h"
 
 #ifdef CONFIG_RTL8XXXU_UNTESTED
 static struct rtl8xxxu_power_base rtl8192c_power_base = {
diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c b/drivers/net/wireless/realtek/rtl8xxxu/8192e.c
similarity index 99%
rename from drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c
rename to drivers/net/wireless/realtek/rtl8xxxu/8192e.c
index 26132b6b9331..562173176c60 100644
--- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c
+++ b/drivers/net/wireless/realtek/rtl8xxxu/8192e.c
@@ -26,7 +26,7 @@
 #include <linux/moduleparam.h>
 #include <net/mac80211.h>
 #include "rtl8xxxu.h"
-#include "rtl8xxxu_regs.h"
+#include "regs.h"
 
 static const struct rtl8xxxu_reg8val rtl8192e_mac_init_table[] = {
 	{0x011, 0xeb}, {0x012, 0x07}, {0x014, 0x75}, {0x303, 0xa7},
diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192f.c b/drivers/net/wireless/realtek/rtl8xxxu/8192f.c
similarity index 99%
rename from drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192f.c
rename to drivers/net/wireless/realtek/rtl8xxxu/8192f.c
index 9f1d4a6ee210..843ff0269b39 100644
--- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192f.c
+++ b/drivers/net/wireless/realtek/rtl8xxxu/8192f.c
@@ -24,7 +24,7 @@
 #include <linux/moduleparam.h>
 #include <net/mac80211.h>
 #include "rtl8xxxu.h"
-#include "rtl8xxxu_regs.h"
+#include "regs.h"
 
 static const struct rtl8xxxu_reg8val rtl8192f_mac_init_table[] = {
 	{0x420, 0x00},	{0x422, 0x78},	{0x428, 0x0a},	{0x429, 0x10},
diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8710b.c b/drivers/net/wireless/realtek/rtl8xxxu/8710b.c
similarity index 99%
rename from drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8710b.c
rename to drivers/net/wireless/realtek/rtl8xxxu/8710b.c
index aa27ac4f828b..ea1cb0d8554e 100644
--- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8710b.c
+++ b/drivers/net/wireless/realtek/rtl8xxxu/8710b.c
@@ -24,7 +24,7 @@
 #include <linux/moduleparam.h>
 #include <net/mac80211.h>
 #include "rtl8xxxu.h"
-#include "rtl8xxxu_regs.h"
+#include "regs.h"
 
 static const struct rtl8xxxu_reg8val rtl8710b_mac_init_table[] = {
 	{0x421, 0x0F}, {0x428, 0x0A}, {0x429, 0x10}, {0x430, 0x00},
diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723a.c b/drivers/net/wireless/realtek/rtl8xxxu/8723a.c
similarity index 99%
rename from drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723a.c
rename to drivers/net/wireless/realtek/rtl8xxxu/8723a.c
index 965c8c3662a6..9f03bf163c97 100644
--- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723a.c
+++ b/drivers/net/wireless/realtek/rtl8xxxu/8723a.c
@@ -26,7 +26,7 @@
 #include <linux/moduleparam.h>
 #include <net/mac80211.h>
 #include "rtl8xxxu.h"
-#include "rtl8xxxu_regs.h"
+#include "regs.h"
 
 static struct rtl8xxxu_power_base rtl8723a_power_base = {
 	.reg_0e00 = 0x0a0c0c0c,
diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c b/drivers/net/wireless/realtek/rtl8xxxu/8723b.c
similarity index 99%
rename from drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c
rename to drivers/net/wireless/realtek/rtl8xxxu/8723b.c
index 3355d8e97870..0880049373b0 100644
--- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c
+++ b/drivers/net/wireless/realtek/rtl8xxxu/8723b.c
@@ -26,7 +26,7 @@
 #include <linux/moduleparam.h>
 #include <net/mac80211.h>
 #include "rtl8xxxu.h"
-#include "rtl8xxxu_regs.h"
+#include "regs.h"
 
 static const struct rtl8xxxu_reg8val rtl8723b_mac_init_table[] = {
 	{0x02f, 0x30}, {0x035, 0x00}, {0x039, 0x08}, {0x04e, 0xe0},
diff --git a/drivers/net/wireless/realtek/rtl8xxxu/Makefile b/drivers/net/wireless/realtek/rtl8xxxu/Makefile
index fa466589eccb..580a2fa675ee 100644
--- a/drivers/net/wireless/realtek/rtl8xxxu/Makefile
+++ b/drivers/net/wireless/realtek/rtl8xxxu/Makefile
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
 obj-$(CONFIG_RTL8XXXU)	+= rtl8xxxu.o
 
-rtl8xxxu-y	:= rtl8xxxu_core.o rtl8xxxu_8192e.o rtl8xxxu_8723b.o \
-		   rtl8xxxu_8723a.o rtl8xxxu_8192c.o rtl8xxxu_8188f.o \
-		   rtl8xxxu_8188e.o rtl8xxxu_8710b.o rtl8xxxu_8192f.o
+rtl8xxxu-y	:= core.o 8192e.o 8723b.o \
+		   8723a.o 8192c.o 8188f.o \
+		   8188e.o 8710b.o 8192f.o
diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c b/drivers/net/wireless/realtek/rtl8xxxu/core.c
similarity index 99%
rename from drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
rename to drivers/net/wireless/realtek/rtl8xxxu/core.c
index 54f955b01475..cda05a6e4772 100644
--- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
+++ b/drivers/net/wireless/realtek/rtl8xxxu/core.c
@@ -26,7 +26,7 @@
 #include <linux/moduleparam.h>
 #include <net/mac80211.h>
 #include "rtl8xxxu.h"
-#include "rtl8xxxu_regs.h"
+#include "regs.h"
 
 #define DRIVER_NAME "rtl8xxxu"
 
diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_regs.h b/drivers/net/wireless/realtek/rtl8xxxu/regs.h
similarity index 100%
rename from drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_regs.h
rename to drivers/net/wireless/realtek/rtl8xxxu/regs.h
-- 
2.39.2


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* RE: [PATCH 1/2] wifi: rtl8xxxu: remove some unused includes
  2024-04-26 14:19 [PATCH 1/2] wifi: rtl8xxxu: remove some unused includes Kalle Valo
  2024-04-26 14:19 ` [PATCH 2/2] wifi: rtl8xxxu: remove rtl8xxxu_ prefix from filenames Kalle Valo
@ 2024-04-29  2:08 ` Ping-Ke Shih
  2024-04-29  2:54 ` Ping-Ke Shih
  2024-05-02  3:07 ` Ping-Ke Shih
  3 siblings, 0 replies; 7+ messages in thread
From: Ping-Ke Shih @ 2024-04-29  2:08 UTC (permalink / raw
  To: Kalle Valo; +Cc: linux-wireless@vger.kernel.org

Kalle Valo <kvalo@kernel.org> wrote:
> I noticed by random that rtl8xxxu includes linux/wireless.h even though it
> doesn't need it. While investigating a bit more I found even more unused
> include files:
> 
> #include <linux/init.h>
> #include <linux/sched.h>
> #include <linux/ethtool.h>
> 
> It looks like that the includes are just copied to every file without checking
> if the file really needs the include. So more includes could be removed but
> that would need more careful analysis per each file.

I can do that. My ways will be to create an empty (new) C file to examine
every driver's header file can be included individually, and then try-and-error
to remove includes from existing C files. 

However, this driver uses #ifdef. I will check if autoconf.h is included.

> 
> No functional changes, compile tested only.
> 
> Signed-off-by: Kalle Valo <kvalo@kernel.org>

Reviewed-by: Ping-Ke Shih <pkshih@realtek.com>



^ permalink raw reply	[flat|nested] 7+ messages in thread

* RE: [PATCH 2/2] wifi: rtl8xxxu: remove rtl8xxxu_ prefix from filenames
  2024-04-26 14:19 ` [PATCH 2/2] wifi: rtl8xxxu: remove rtl8xxxu_ prefix from filenames Kalle Valo
@ 2024-04-29  2:08   ` Ping-Ke Shih
  0 siblings, 0 replies; 7+ messages in thread
From: Ping-Ke Shih @ 2024-04-29  2:08 UTC (permalink / raw
  To: Kalle Valo; +Cc: linux-wireless@vger.kernel.org

Kalle Valo <kvalo@kernel.org> wrote:
> The driver is already in a directory named rtl8xxxu, there's no need to
> duplicate that in the filename as well. Now file listing looks a lot more
> reasonable:
> 
> 8188e.c  8192c.c  8192f.c  8723a.c  core.c   Makefile  rtl8xxxu.h
> 8188f.c  8192e.c  8710b.c  8723b.c  Kconfig  regs.h
> 
> No functional changes, compile tested only.
> 
> Signed-off-by: Kalle Valo <kvalo@kernel.org>

Reviewed-by: Ping-Ke Shih <pkshih@realtek.com>


^ permalink raw reply	[flat|nested] 7+ messages in thread

* RE: [PATCH 1/2] wifi: rtl8xxxu: remove some unused includes
  2024-04-26 14:19 [PATCH 1/2] wifi: rtl8xxxu: remove some unused includes Kalle Valo
  2024-04-26 14:19 ` [PATCH 2/2] wifi: rtl8xxxu: remove rtl8xxxu_ prefix from filenames Kalle Valo
  2024-04-29  2:08 ` [PATCH 1/2] wifi: rtl8xxxu: remove some unused includes Ping-Ke Shih
@ 2024-04-29  2:54 ` Ping-Ke Shih
  2024-04-29 12:23   ` Kalle Valo
  2024-05-02  3:07 ` Ping-Ke Shih
  3 siblings, 1 reply; 7+ messages in thread
From: Ping-Ke Shih @ 2024-04-29  2:54 UTC (permalink / raw
  To: Kalle Valo; +Cc: linux-wireless@vger.kernel.org

Ping-Ke Shih wrote:
> Kalle Valo <kvalo@kernel.org> wrote:
> > I noticed by random that rtl8xxxu includes linux/wireless.h even though it
> > doesn't need it. While investigating a bit more I found even more unused
> > include files:
> >
> > #include <linux/init.h>
> > #include <linux/sched.h>
> > #include <linux/ethtool.h>
> >
> > It looks like that the includes are just copied to every file without checking
> > if the file really needs the include. So more includes could be removed but
> > that would need more careful analysis per each file.
> 
> I can do that. My ways will be to create an empty (new) C file to examine
> every driver's header file can be included individually, and then try-and-error
> to remove includes from existing C files.

I made a patch [1] followed above ways based on these two patches.

> 
> However, this driver uses #ifdef. I will check if autoconf.h is included.

Make script of kernel will automatically include include/linux/kconfig.h, so
I didn't need extra works for #ifdef.

[1] https://lore.kernel.org/linux-wireless/20240429024711.30992-1-pkshih@realtek.com/T/#u


^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH 1/2] wifi: rtl8xxxu: remove some unused includes
  2024-04-29  2:54 ` Ping-Ke Shih
@ 2024-04-29 12:23   ` Kalle Valo
  0 siblings, 0 replies; 7+ messages in thread
From: Kalle Valo @ 2024-04-29 12:23 UTC (permalink / raw
  To: Ping-Ke Shih; +Cc: linux-wireless@vger.kernel.org

Ping-Ke Shih <pkshih@realtek.com> writes:

> Ping-Ke Shih wrote:
>> Kalle Valo <kvalo@kernel.org> wrote:
>> > I noticed by random that rtl8xxxu includes linux/wireless.h even though it
>> > doesn't need it. While investigating a bit more I found even more unused
>> > include files:
>> >
>> > #include <linux/init.h>
>> > #include <linux/sched.h>
>> > #include <linux/ethtool.h>
>> >
>> > It looks like that the includes are just copied to every file without checking
>> > if the file really needs the include. So more includes could be removed but
>> > that would need more careful analysis per each file.
>> 
>> I can do that. My ways will be to create an empty (new) C file to examine
>> every driver's header file can be included individually, and then try-and-error
>> to remove includes from existing C files.
>
> I made a patch [1] followed above ways based on these two patches.

Excellent, thanks Ping.

-- 
https://patchwork.kernel.org/project/linux-wireless/list/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH 1/2] wifi: rtl8xxxu: remove some unused includes
  2024-04-26 14:19 [PATCH 1/2] wifi: rtl8xxxu: remove some unused includes Kalle Valo
                   ` (2 preceding siblings ...)
  2024-04-29  2:54 ` Ping-Ke Shih
@ 2024-05-02  3:07 ` Ping-Ke Shih
  3 siblings, 0 replies; 7+ messages in thread
From: Ping-Ke Shih @ 2024-05-02  3:07 UTC (permalink / raw
  To: Kalle Valo, pkshih; +Cc: linux-wireless

Kalle Valo <kvalo@kernel.org> wrote:

> I noticed by random that rtl8xxxu includes linux/wireless.h even though it
> doesn't need it. While investigating a bit more I found even more unused
> include files:
> 
> #include <linux/init.h>
> #include <linux/sched.h>
> #include <linux/ethtool.h>
> 
> It looks like that the includes are just copied to every file without checking
> if the file really needs the include. So more includes could be removed but
> that would need more careful analysis per each file.
> 
> No functional changes, compile tested only.
> 
> Signed-off-by: Kalle Valo <kvalo@kernel.org>
> Reviewed-by: Ping-Ke Shih <pkshih@realtek.com>

2 patch(es) applied to rtw-next branch of rtw.git, thanks.

a890495b297b wifi: rtl8xxxu: remove some unused includes
028fa281712d wifi: rtl8xxxu: remove rtl8xxxu_ prefix from filenames

---
https://github.com/pkshih/rtw.git


^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2024-05-02  3:07 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-04-26 14:19 [PATCH 1/2] wifi: rtl8xxxu: remove some unused includes Kalle Valo
2024-04-26 14:19 ` [PATCH 2/2] wifi: rtl8xxxu: remove rtl8xxxu_ prefix from filenames Kalle Valo
2024-04-29  2:08   ` Ping-Ke Shih
2024-04-29  2:08 ` [PATCH 1/2] wifi: rtl8xxxu: remove some unused includes Ping-Ke Shih
2024-04-29  2:54 ` Ping-Ke Shih
2024-04-29 12:23   ` Kalle Valo
2024-05-02  3:07 ` Ping-Ke Shih

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).