[PATCH 01/16] mt76: move mt76_reg_pair definition in mt76.h

[PATCH 01/16] mt76: move mt76_reg_pair definition in mt76.h

[Lorenzo Bianconi]

Move common definition of mt76_reg_pair in mt76.h
and remove duplicated code in mt76x2_init_common.c

Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi@redhat.com>
---
 drivers/net/wireless/mediatek/mt76/mt76.h             |  5 +++++
 drivers/net/wireless/mediatek/mt76/mt76x0/mt76x0.h    |  5 -----
 .../net/wireless/mediatek/mt76/mt76x2_init_common.c   | 11 +++--------
 3 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/drivers/net/wireless/mediatek/mt76/mt76.h b/drivers/net/wireless/mediatek/mt76/mt76.h
index b02b4191ef37..fc27260080af 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76.h
@@ -53,6 +53,11 @@ enum mt76_txq_id {
 	__MT_TXQ_MAX
 };
 
+struct mt76_reg_pair {
+	u32 reg;
+	u32 value;
+};
+
 enum mt76_rxq_id {
 	MT_RXQ_MAIN,
 	MT_RXQ_MCU,
diff --git a/drivers/net/wireless/mediatek/mt76/mt76x0/mt76x0.h b/drivers/net/wireless/mediatek/mt76/mt76x0/mt76x0.h
index 12f3dd1cc405..a694cc46fac8 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76x0/mt76x0.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76x0/mt76x0.h
@@ -219,11 +219,6 @@ struct mt76x0_wcid {
 	u8 tx_rate_nss;
 };
 
-struct mt76_reg_pair {
-	u32 reg;
-	u32 value;
-};
-
 struct mt76x0_rxwi;
 
 extern const struct ieee80211_ops mt76x0_ops;
diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2_init_common.c b/drivers/net/wireless/mediatek/mt76/mt76x2_init_common.c
index 953effec8c1a..6af26350c177 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76x2_init_common.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x2_init_common.c
@@ -47,11 +47,6 @@ struct ieee80211_rate mt76x2_rates[] = {
 };
 EXPORT_SYMBOL_GPL(mt76x2_rates);
 
-struct mt76x2_reg_pair {
-	u32 reg;
-	u32 value;
-};
-
 static void
 mt76x2_set_wlan_state(struct mt76x2_dev *dev, bool enable)
 {
@@ -93,7 +88,7 @@ EXPORT_SYMBOL_GPL(mt76x2_reset_wlan);
 
 static void
 mt76x2_write_reg_pairs(struct mt76x2_dev *dev,
-		       const struct mt76x2_reg_pair *data, int len)
+		       const struct mt76_reg_pair *data, int len)
 {
 	while (len > 0) {
 		mt76_wr(dev, data->reg, data->value);
@@ -128,7 +123,7 @@ void mt76_write_mac_initvals(struct mt76x2_dev *dev)
 	 FIELD_PREP(MT_PROT_CFG_NAV, 1) |			\
 	 FIELD_PREP(MT_PROT_CFG_TXOP_ALLOW, 0x3f))
 
-	static const struct mt76x2_reg_pair vals[] = {
+	static const struct mt76_reg_pair vals[] = {
 		/* Copied from MediaTek reference source */
 		{ MT_PBF_SYS_CTRL,		0x00080c00 },
 		{ MT_PBF_CFG,			0x1efebcff },
@@ -184,7 +179,7 @@ void mt76_write_mac_initvals(struct mt76x2_dev *dev)
 		{ MT_PROT_AUTO_TX_CFG,		0x00830083 },
 		{ MT_HT_CTRL_CFG,		0x000001ff },
 	};
-	struct mt76x2_reg_pair prot_vals[] = {
+	struct mt76_reg_pair prot_vals[] = {
 		{ MT_CCK_PROT_CFG,		DEFAULT_PROT_CFG_CCK },
 		{ MT_OFDM_PROT_CFG,		DEFAULT_PROT_CFG_OFDM },
 		{ MT_MM20_PROT_CFG,		DEFAULT_PROT_CFG_20 },
-- 
2.18.0

Re: [PATCH 01/16] mt76: move mt76_reg_pair definition in mt76.h

[Kalle Valo]

Lorenzo Bianconi <lorenzo.bianconi@redhat.com> wrote:

> Move common definition of mt76_reg_pair in mt76.h
> and remove duplicated code in mt76x2_init_common.c
> 
> Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi@redhat.com>

16 patches applied to wireless-drivers-next.git, thanks.

5090efa4a2e8 mt76: move mt76_reg_pair definition in mt76.h
4c89ff2c74e3 mt76: split __mt76u_mcu_send_msg and mt76u_mcu_send_msg routines
288d600a8880 mt76: move mt76x2u_mcu_deinit routine in mt76-usb module
851ab66e293c mt76: add multiple regs read support to usb_mcu layer
795dbf0fd20c mt76x0: use mt76u_init for bus initialization
e9fa647a0ad3 mt76x0: remove mt76x0_vendor_reset routine
72750efddba9 mt76x0: remove mt76x0_vendor_single_wr routine
84740d5dc66e mt76x0: remove mt76x0_mcu_msg_alloc routine
ad27c4ae0ba7 mt76x0: use shared mt76 usb mcu completion
73d411e2d499 mt76x0: remove mt76x0_complete_urb routine
172222cff066 mt76x0: remove mt76x0_vendor_request routine
876d3d02ee31 mt76x0: remove unused mt76x0_wait_asic_ready routine
6f4796b7063e mt76x0: use mt76u_mcu_send_msg utility routine to send fw cmds
0e3612e06be4 mt76x0: remove unused mt76x0_mcu structure
a0b65ca60ec7 mt76x0: use mt76u_mcu_fw_send_data for fw uploading
01b302cd5874 mt76x0: remove unused routines for usb_buff alloc/free

-- 
https://patchwork.kernel.org/patch/10576059/

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