wifi: rtl8xxxu: remove some unused includes
PATCH 1/2 wifi: rtl8xxxu: remove some unused includes
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.
--- 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(-)
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c +0 -4
@@ -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>
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188f.c +0 -4
@@ -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>
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192c.c +0 -4
@@ -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>
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c +0 -4
@@ -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>
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192f.c +0 -4
@@ -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>
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8710b.c +0 -4
@@ -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>
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723a.c +0 -4
@@ -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>
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c +0 -4
@@ -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>
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c +0 -4
@@ -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
Signature · 1 line
2.39.2
PATCH 2/2 wifi: rtl8xxxu: remove rtl8xxxu_ prefix from filenames
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.
---
.../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%)drivers/net/wireless/realtek/rtl8xxxu/8188e.c renamed from drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c +1 -1
@@ -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 },
drivers/net/wireless/realtek/rtl8xxxu/8188f.c renamed from drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188f.c +1 -1
@@ -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 },
drivers/net/wireless/realtek/rtl8xxxu/8192c.c renamed from drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192c.c +1 -1
@@ -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 = {
drivers/net/wireless/realtek/rtl8xxxu/8192e.c renamed from drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c +1 -1
@@ -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 },
drivers/net/wireless/realtek/rtl8xxxu/8192f.c renamed from drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192f.c +1 -1
@@ -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 },
drivers/net/wireless/realtek/rtl8xxxu/8710b.c renamed from drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8710b.c +1 -1
@@ -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 },
drivers/net/wireless/realtek/rtl8xxxu/8723a.c renamed from drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723a.c +1 -1
@@ -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 ,
drivers/net/wireless/realtek/rtl8xxxu/8723b.c renamed from drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c +1 -1
@@ -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 },
drivers/net/wireless/realtek/rtl8xxxu/Makefile +3 -3
@@ -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
drivers/net/wireless/realtek/rtl8xxxu/core.c renamed from drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c +1 -1
@@ -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"
drivers/net/wireless/realtek/rtl8xxxu/regs.h renamed from drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_regs.h +0 -0
Signature · 1 line
2.39.2
RE: [PATCH 2/2] wifi: rtl8xxxu: remove rtl8xxxu_ prefix from filenames
Quoted 10 lines · Kalle Valo
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.hNo functional changes, compile tested only.
Signed-off-by Kalle Valo <[email protected]>
Quoted 11 lines · Kalle Valo
I noticed by random that rtl8xxxu includes
linux/wireless.heven 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.
Quoted 4 lines
No functional changes, compile tested only.
Signed-off-by Kalle Valo <[email protected]>
Quoted 9 lines · Ping-Ke Shih
Quoted 8 lines · Kalle Valo
I noticed by random that rtl8xxxu includes
linux/wireless.heven 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>
Quoted 7 lines
Quoted 3 lines
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.
Quoted 2 lines
However, this driver uses #ifdef. I will check if
autoconf.his 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/[email protected]/T/#u
Quoted 14 lines · Ping-Ke Shih
Quoted 13 lines · Ping-Ke Shih
Quoted 11 lines · Kalle Valo
I noticed by random that rtl8xxxu includes
linux/wireless.heven 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.
Quoted 5 lines
Quoted 3 lines
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.
Signature · 3 lines
https://patchwork.kernel.org/project/linux-wireless/list/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
Quoted 8 lines · Kalle Valo
I noticed by random that rtl8xxxu includes
linux/wireless.heven 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>
Quoted 8 lines
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 <[email protected]>Reviewed-by Ping-Ke Shih <[email protected]>
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