mt76: rename mt76x02_util.h in mt76x02.h

Rename mt76x02_util.h header file in mt76x02.h since now contains all mt76x02 related definitions and not just utility routines declarations Signed-off-by: Lorenzo Bianconi <[email protected]> Signed-off-by: Felix Fietkau <[email protected]>
hartl3y94 · Oct 5, 2018 · 9c874cd · 9c874cd
1 parent 159f767
commit 9c874cd
Show file tree

Hide file tree

Showing 27 changed files with 15 additions and 56 deletions.
diff --git a/mt76x0/init.c b/mt76x0/init.c
@@ -18,9 +18,6 @@
 #include "eeprom.h"
 #include "trace.h"
 #include "mcu.h"
-#include "../mt76x02_util.h"
-#include "../mt76x02_dma.h"
-
 #include "initvals.h"
 
 static void mt76x0_vht_cap_mask(struct ieee80211_supported_band *sband)

diff --git a/mt76x0/mac.c b/mt76x0/mac.c
@@ -13,10 +13,10 @@
  * GNU General Public License for more details.
  */
 
+#include <linux/etherdevice.h>
+
 #include "mt76x0.h"
 #include "trace.h"
-#include "../mt76x02_util.h"
-#include <linux/etherdevice.h>
 
 void mt76x0_mac_set_protection(struct mt76x02_dev *dev, bool legacy_prot,
 			       int ht_mode)

diff --git a/mt76x0/main.c b/mt76x0/main.c
@@ -13,9 +13,8 @@
  * GNU General Public License for more details.
  */
 
-#include "mt76x0.h"
-#include "../mt76x02_util.h"
 #include <linux/etherdevice.h>
+#include "mt76x0.h"
 
 int mt76x0_config(struct ieee80211_hw *hw, u32 changed)
 {

diff --git a/mt76x0/mt76x0.h b/mt76x0/mt76x0.h
@@ -25,10 +25,7 @@
 #include <net/mac80211.h>
 #include <linux/debugfs.h>
 
-#include "../mt76.h"
-#include "../mt76x02_regs.h"
-#include "../mt76x02_mac.h"
-#include "../mt76x02_util.h"
+#include "../mt76x02.h"
 #include "eeprom.h"
 
 #define MT_CALIBRATE_INTERVAL		(4 * HZ)

diff --git a/mt76x0/pci.c b/mt76x0/pci.c
@@ -20,8 +20,6 @@
 
 #include "mt76x0.h"
 #include "mcu.h"
-#include "../mt76x02_dma.h"
-#include "../mt76x02_util.h"
 
 static int mt76x0e_start(struct ieee80211_hw *hw)
 {

diff --git a/mt76x0/usb.c b/mt76x0/usb.c
@@ -18,7 +18,6 @@
 #include "mt76x0.h"
 #include "mcu.h"
 #include "trace.h"
-#include "../mt76x02_util.h"
 #include "../mt76x02_usb.h"
 
 static struct usb_device_id mt76x0_device_table[] = {

diff --git a/mt76x02_util.h → mt76x02.h b/mt76x02_util.h → mt76x02.h
@@ -20,8 +20,11 @@
 
 #include <linux/kfifo.h>
 
+#include "mt76.h"
+#include "mt76x02_regs.h"
 #include "mt76x02_mac.h"
 #include "mt76x02_dfs.h"
+#include "mt76x02_dma.h"
 
 struct mt76x02_mac_stats {
 	u64 rx_stat[6];

diff --git a/mt76x02_mac.c b/mt76x02_mac.c
@@ -15,10 +15,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include "mt76.h"
-#include "mt76x02_regs.h"
-#include "mt76x02_mac.h"
-#include "mt76x02_util.h"
+#include "mt76x02.h"
 
 enum mt76x02_cipher_type
 mt76x02_mac_get_key_info(struct ieee80211_key_conf *key, u8 *key_data)

diff --git a/mt76x02_mmio.c b/mt76x02_mmio.c
@@ -17,10 +17,7 @@
 
 #include <linux/kernel.h>
 
-#include "mt76.h"
-#include "mt76x02_dma.h"
-#include "mt76x02_util.h"
-#include "mt76x02_mac.h"
+#include "mt76x02.h"
 
 static int
 mt76x02_init_tx_queue(struct mt76_dev *dev, struct mt76_queue *q,

diff --git a/mt76x02_txrx.c b/mt76x02_txrx.c
@@ -17,10 +17,7 @@
 
 #include <linux/kernel.h>
 
-#include "mt76.h"
-#include "mt76x02_regs.h"
-#include "mt76x02_dma.h"
-#include "mt76x02_util.h"
+#include "mt76x02.h"
 
 void mt76x02_tx(struct ieee80211_hw *hw, struct ieee80211_tx_control *control,
 		struct sk_buff *skb)

diff --git a/mt76x02_usb_core.c b/mt76x02_usb_core.c
@@ -14,10 +14,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include "mt76.h"
-#include "mt76x02_dma.h"
-#include "mt76x02_mac.h"
-#include "mt76x02_util.h"
+#include "mt76x02.h"
 
 static int mt76x02u_check_skb_rooms(struct sk_buff *skb)
 {

diff --git a/mt76x02_util.c b/mt76x02_util.c
@@ -16,10 +16,7 @@
  */
 
 #include <linux/module.h>
-#include "mt76.h"
-#include "mt76x02_regs.h"
-#include "mt76x02_mac.h"
-#include "mt76x02_util.h"
+#include "mt76x02.h"
 
 #define CCK_RATE(_idx, _rate) {					\
 	.bitrate = _rate,					\

diff --git a/mt76x2/mac.c b/mt76x2/mac.c
@@ -16,7 +16,6 @@
  */
 
 #include "mt76x2.h"
-#include "../mt76x02_util.h"
 
 void mt76x2_mac_stop(struct mt76x02_dev *dev, bool force)
 {

diff --git a/mt76x2/mac.h b/mt76x2/mac.h
@@ -17,8 +17,7 @@
 #ifndef __MT76x2_MAC_H
 #define __MT76x2_MAC_H
 
-#include "../mt76.h"
-#include "../mt76x02_mac.h"
+#include "mt76x2.h"
 
 struct mt76x02_dev;
 struct mt76x2_sta;

diff --git a/mt76x2/mcu.c b/mt76x2/mcu.c
@@ -22,7 +22,6 @@
 #include "mt76x2.h"
 #include "mcu.h"
 #include "eeprom.h"
-#include "../mt76x02_dma.h"
 
 int mt76x2_mcu_set_channel(struct mt76x02_dev *dev, u8 channel, u8 bw,
 			   u8 bw_index, bool scan)

diff --git a/mt76x2/mt76x2.h b/mt76x2/mt76x2.h
@@ -36,9 +36,7 @@
 
 #define MT_CALIBRATE_INTERVAL	HZ
 
-#include "../mt76.h"
-#include "../mt76x02_regs.h"
-#include "../mt76x02_util.h"
+#include "../mt76x02.h"
 #include "mac.h"
 #include "dfs.h"
 

diff --git a/mt76x2/mt76x2u.h b/mt76x2/mt76x2u.h
@@ -21,7 +21,6 @@
 
 #include "mt76x2.h"
 #include "mcu.h"
-#include "../mt76x02_dma.h"
 
 #define MT7612U_EEPROM_SIZE		512
 

diff --git a/mt76x2/pci_core.c b/mt76x2/pci_core.c
@@ -17,7 +17,6 @@
 #include <linux/delay.h>
 #include "mt76x2.h"
 #include "trace.h"
-#include "../mt76x02_util.h"
 
 void mt76x2_rx_poll_complete(struct mt76_dev *mdev, enum mt76_rxq_id q)
 {

diff --git a/mt76x2/pci_dfs.c b/mt76x2/pci_dfs.c
@@ -15,7 +15,6 @@
  */
 
 #include "mt76x2.h"
-#include "../mt76x02_util.h"
 
 #define RADAR_SPEC(m, len, el, eh, wl, wh,		\
 		   w_tolerance, tl, th, t_tolerance,	\

diff --git a/mt76x2/pci_dma.c b/mt76x2/pci_dma.c
@@ -15,8 +15,6 @@
  */
 
 #include "mt76x2.h"
-#include "../mt76x02_dma.h"
-#include "../mt76x02_util.h"
 
 void mt76x2_tx_tasklet(unsigned long data)
 {

diff --git a/mt76x2/pci_init.c b/mt76x2/pci_init.c
@@ -18,8 +18,6 @@
 #include "mt76x2.h"
 #include "eeprom.h"
 #include "mcu.h"
-#include "../mt76x02_util.h"
-#include "../mt76x02_dma.h"
 
 static void
 mt76x2_mac_pbf_init(struct mt76x02_dev *dev)

diff --git a/mt76x2/pci_mac.c b/mt76x2/pci_mac.c
@@ -19,7 +19,6 @@
 #include "mcu.h"
 #include "eeprom.h"
 #include "trace.h"
-#include "../mt76x02_util.h"
 
 void mt76x2_mac_set_bssid(struct mt76x02_dev *dev, u8 idx, const u8 *addr)
 {

diff --git a/mt76x2/pci_main.c b/mt76x2/pci_main.c
@@ -15,7 +15,6 @@
  */
 
 #include "mt76x2.h"
-#include "../mt76x02_util.h"
 
 static int
 mt76x2_start(struct ieee80211_hw *hw)

diff --git a/mt76x2/pci_mcu.c b/mt76x2/pci_mcu.c
@@ -21,7 +21,6 @@
 #include "mt76x2.h"
 #include "mcu.h"
 #include "eeprom.h"
-#include "../mt76x02_dma.h"
 
 static int
 mt76pci_load_rom_patch(struct mt76x02_dev *dev)

diff --git a/mt76x2/pci_tx.c b/mt76x2/pci_tx.c
@@ -15,8 +15,6 @@
  */
 
 #include "mt76x2.h"
-#include "../mt76x02_util.h"
-#include "../mt76x02_dma.h"
 
 struct beacon_bc_data {
 	struct mt76x02_dev *dev;

diff --git a/mt76x2/usb_init.c b/mt76x2/usb_init.c
@@ -17,9 +17,8 @@
 #include <linux/delay.h>
 
 #include "mt76x2u.h"
-#include "../mt76x02_util.h"
-#include "../mt76x02_phy.h"
 #include "eeprom.h"
+#include "../mt76x02_phy.h"
 #include "../mt76x02_usb.h"
 
 static void mt76x2u_init_dma(struct mt76x02_dev *dev)

diff --git a/mt76x2/usb_main.c b/mt76x2/usb_main.c
@@ -15,7 +15,6 @@
  */
 
 #include "mt76x2u.h"
-#include "../mt76x02_util.h"
 
 static int mt76x2u_start(struct ieee80211_hw *hw)
 {
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,7 +16,6 @@ @@
      */
     #include "mt76x2.h"
-    #include "../mt76x02_util.h"
     void mt76x2_mac_stop(struct mt76x02_dev *dev, bool force)
     {
@@ Expand Down @@