wifi: rtl8xxxu: cleanup includes
PATCH 1/1 wifi: rtl8xxxu: cleanup includes
Remove unnecessary includes from driver. The first step is to add necessary includes to driver's header files to make them can be included individually. Then, driver's C files include driver's header files first, and check if still missed header files of kernel.
The results show that most C files only include driver's header files. Only core.c needs to include additional linux/firmware.h.
Also sort includes in alphabetic order.
Compile tested only.
--- drivers/net/wireless/realtek/rtl8xxxu/8188e.c | 14 +------------- drivers/net/wireless/realtek/rtl8xxxu/8188f.c | 14 +------------- drivers/net/wireless/realtek/rtl8xxxu/8192c.c | 14 +------------- drivers/net/wireless/realtek/rtl8xxxu/8192e.c | 14 +------------- drivers/net/wireless/realtek/rtl8xxxu/8192f.c | 14 +------------- drivers/net/wireless/realtek/rtl8xxxu/8710b.c | 14 +------------- drivers/net/wireless/realtek/rtl8xxxu/8723a.c | 14 +------------- drivers/net/wireless/realtek/rtl8xxxu/8723b.c | 14 +------------- drivers/net/wireless/realtek/rtl8xxxu/core.c | 13 +------------ drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h | 3 ++- 10 files changed, 11 insertions(+), 117 deletions(-)
drivers/net/wireless/realtek/rtl8xxxu/8188e.c +1 -13
@@ -13,20 +13,8 @@* additional 8xxx chips like the 8192cu, 8188cus, etc. */ -#include <linux/kernel.h> -#include <linux/errno.h> -#include <linux/slab.h> -#include <linux/module.h> -#include <linux/spinlock.h> -#include <linux/list.h> -#include <linux/usb.h> -#include <linux/netdevice.h> -#include <linux/etherdevice.h> -#include <linux/firmware.h> -#include <linux/moduleparam.h> -#include <net/mac80211.h> -#include "rtl8xxxu.h" #include "regs.h" +#include "rtl8xxxu.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 +1 -13
@@ -11,20 +11,8 @@* Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. */ -#include <linux/kernel.h> -#include <linux/errno.h> -#include <linux/slab.h> -#include <linux/module.h> -#include <linux/spinlock.h> -#include <linux/list.h> -#include <linux/usb.h> -#include <linux/netdevice.h> -#include <linux/etherdevice.h> -#include <linux/firmware.h> -#include <linux/moduleparam.h> -#include <net/mac80211.h> -#include "rtl8xxxu.h" #include "regs.h" +#include "rtl8xxxu.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 +1 -13
@@ -13,20 +13,8 @@* additional 8xxx chips like the 8192cu, 8188cus, etc. */ -#include <linux/kernel.h> -#include <linux/errno.h> -#include <linux/slab.h> -#include <linux/module.h> -#include <linux/spinlock.h> -#include <linux/list.h> -#include <linux/usb.h> -#include <linux/netdevice.h> -#include <linux/etherdevice.h> -#include <linux/firmware.h> -#include <linux/moduleparam.h> -#include <net/mac80211.h> -#include "rtl8xxxu.h" #include "regs.h" +#include "rtl8xxxu.h" #ifdef CONFIG_RTL8XXXU_UNTESTED static struct rtl8xxxu_power_base rtl8192c_power_base = {
drivers/net/wireless/realtek/rtl8xxxu/8192e.c +1 -13
@@ -13,20 +13,8 @@* additional 8xxx chips like the 8192cu, 8188cus, etc. */ -#include <linux/kernel.h> -#include <linux/errno.h> -#include <linux/slab.h> -#include <linux/module.h> -#include <linux/spinlock.h> -#include <linux/list.h> -#include <linux/usb.h> -#include <linux/netdevice.h> -#include <linux/etherdevice.h> -#include <linux/firmware.h> -#include <linux/moduleparam.h> -#include <net/mac80211.h> -#include "rtl8xxxu.h" #include "regs.h" +#include "rtl8xxxu.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 +1 -13
@@ -11,20 +11,8 @@* Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. */ -#include <linux/kernel.h> -#include <linux/errno.h> -#include <linux/slab.h> -#include <linux/module.h> -#include <linux/spinlock.h> -#include <linux/list.h> -#include <linux/usb.h> -#include <linux/netdevice.h> -#include <linux/etherdevice.h> -#include <linux/firmware.h> -#include <linux/moduleparam.h> -#include <net/mac80211.h> -#include "rtl8xxxu.h" #include "regs.h" +#include "rtl8xxxu.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 +1 -13
@@ -11,20 +11,8 @@* Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. */ -#include <linux/kernel.h> -#include <linux/errno.h> -#include <linux/slab.h> -#include <linux/module.h> -#include <linux/spinlock.h> -#include <linux/list.h> -#include <linux/usb.h> -#include <linux/netdevice.h> -#include <linux/etherdevice.h> -#include <linux/firmware.h> -#include <linux/moduleparam.h> -#include <net/mac80211.h> -#include "rtl8xxxu.h" #include "regs.h" +#include "rtl8xxxu.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 +1 -13
@@ -13,20 +13,8 @@* additional 8xxx chips like the 8192cu, 8188cus, etc. */ -#include <linux/kernel.h> -#include <linux/errno.h> -#include <linux/slab.h> -#include <linux/module.h> -#include <linux/spinlock.h> -#include <linux/list.h> -#include <linux/usb.h> -#include <linux/netdevice.h> -#include <linux/etherdevice.h> -#include <linux/firmware.h> -#include <linux/moduleparam.h> -#include <net/mac80211.h> -#include "rtl8xxxu.h" #include "regs.h" +#include "rtl8xxxu.h" static struct rtl8xxxu_power_base rtl8723a_power_base = { .reg_0e00 =0x0a0c0c0c ,
drivers/net/wireless/realtek/rtl8xxxu/8723b.c +1 -13
@@ -13,20 +13,8 @@* additional 8xxx chips like the 8192cu, 8188cus, etc. */ -#include <linux/kernel.h> -#include <linux/errno.h> -#include <linux/slab.h> -#include <linux/module.h> -#include <linux/spinlock.h> -#include <linux/list.h> -#include <linux/usb.h> -#include <linux/netdevice.h> -#include <linux/etherdevice.h> -#include <linux/firmware.h> -#include <linux/moduleparam.h> -#include <net/mac80211.h> -#include "rtl8xxxu.h" #include "regs.h" +#include "rtl8xxxu.h" static const struct rtl8xxxu_reg8val rtl8723b_mac_init_table[] = { {0x02f ,0x30 }, {0x035 ,0x00 }, {0x039 ,0x08 }, {0x04e ,0xe0 },
drivers/net/wireless/realtek/rtl8xxxu/core.c +1 -12
@@ -13,20 +13,9 @@* additional 8xxx chips like the 8192cu, 8188cus, etc. */ -#include <linux/kernel.h> -#include <linux/errno.h> -#include <linux/slab.h> -#include <linux/module.h> -#include <linux/spinlock.h> -#include <linux/list.h> -#include <linux/usb.h> -#include <linux/netdevice.h> -#include <linux/etherdevice.h> #include <linux/firmware.h> -#include <linux/moduleparam.h> -#include <net/mac80211.h> -#include "rtl8xxxu.h" #include "regs.h" +#include "rtl8xxxu.h" #define DRIVER_NAME "rtl8xxxu"
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h +2 -1
@@ -5,8 +5,9 @@* Register definitions taken from original Realtek rtl8723au driver */ -#include <asm/byteorder.h> #include <linux/average.h> +#include <linux/usb.h> +#include <net/mac80211.h> #define RTL8XXXU_DEBUG_REG_WRITE 0x01#define RTL8XXXU_DEBUG_REG_READ 0x02
Signature · 1 line
2.25.1
Quoted 5 lines · Ping-Ke Shih
Remove unnecessary includes from driver. The first step is to add necessary includes to driver's header files to make them can be included individually. Then, driver's C files include driver's header files first, and check if still missed header files of kernel.
Quoted 8 lines
The results show that most C files only include driver's header files. Only
core.cneeds to include additionallinux/firmware.h.Also sort includes in alphabetic order.
Compile tested only.
Signed-off-by Ping-Ke Shih <[email protected]>
1 patch(es) applied to rtw-next branch of rtw.git, thanks.
949f6f3aeb87 wifi: rtl8xxxu: cleanup includes