Commit fa62d0e0 authored by Felix Fietkau's avatar Felix Fietkau
Browse files

mt76: rename __mt76_mcu_skb_send_msg to mt76_mcu_skb_send_msg 



Preparation for further cleanup

Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent cb5cdd4c

drivers/net/wireless/mediatek/mt76/mt76.h

+1 −1
Original line number Diff line number Diff line
@@ -687,7 +687,7 @@ enum mt76_phy_type { 




#define mt76_mcu_send_msg(dev, ...)	(dev)->mcu_ops->mcu_send_msg((dev), __VA_ARGS__)

#define __mt76_mcu_skb_send_msg(dev, ...)	(dev)->mcu_ops->mcu_skb_send_msg((dev), __VA_ARGS__)

#define mt76_mcu_skb_send_msg(dev, ...)	(dev)->mcu_ops->mcu_skb_send_msg((dev), __VA_ARGS__)

#define mt76_mcu_restart(dev, ...)	(dev)->mt76.mcu_ops->mcu_restart(&((dev)->mt76))

#define __mt76_mcu_restart(dev, ...)	(dev)->mcu_ops->mcu_restart((dev))

drivers/net/wireless/mediatek/mt76/mt7615/mcu.c

+38 −38
Original line number Diff line number Diff line
@@ -288,7 +288,7 @@ int mt7615_mcu_msg_send(struct mt76_dev *mdev, int cmd, const void *data, 
	if (!skb)

		return -ENOMEM;



	return __mt76_mcu_skb_send_msg(mdev, skb, cmd, wait_resp);

	return mt76_mcu_skb_send_msg(mdev, skb, cmd, wait_resp);

}

EXPORT_SYMBOL_GPL(mt7615_mcu_msg_send);
@@ -1278,7 +1278,7 @@ mt7615_mcu_add_bss(struct mt7615_phy *phy, struct ieee80211_vif *vif, 
	if (enable && mvif->omac_idx > EXT_BSSID_START)

		mt7615_mcu_bss_ext_tlv(skb, mvif);



	return __mt76_mcu_skb_send_msg(&dev->mt76, skb,

	return mt76_mcu_skb_send_msg(&dev->mt76, skb,

				     MCU_EXT_CMD_BSS_INFO_UPDATE, true);

}
@@ -1299,8 +1299,8 @@ mt7615_mcu_wtbl_tx_ba(struct mt7615_dev *dev, 


	mt7615_mcu_wtbl_ba_tlv(skb, params, enable, true, NULL, wtbl_hdr);



	err = __mt76_mcu_skb_send_msg(&dev->mt76, skb,

				      MCU_EXT_CMD_WTBL_UPDATE, true);

	err = mt76_mcu_skb_send_msg(&dev->mt76, skb, MCU_EXT_CMD_WTBL_UPDATE,

				    true);

	if (err < 0)

		return err;
@@ -1310,7 +1310,7 @@ mt7615_mcu_wtbl_tx_ba(struct mt7615_dev *dev, 


	mt7615_mcu_sta_ba_tlv(skb, params, enable, true);



	return __mt76_mcu_skb_send_msg(&dev->mt76, skb,

	return mt76_mcu_skb_send_msg(&dev->mt76, skb,

				     MCU_EXT_CMD_STA_REC_UPDATE, true);

}
@@ -1331,7 +1331,7 @@ mt7615_mcu_wtbl_rx_ba(struct mt7615_dev *dev, 


	mt7615_mcu_sta_ba_tlv(skb, params, enable, false);



	err = __mt76_mcu_skb_send_msg(&dev->mt76, skb,

	err = mt76_mcu_skb_send_msg(&dev->mt76, skb,

				    MCU_EXT_CMD_STA_REC_UPDATE, true);

	if (err < 0 || !enable)

		return err;
@@ -1343,8 +1343,8 @@ mt7615_mcu_wtbl_rx_ba(struct mt7615_dev *dev, 


	mt7615_mcu_wtbl_ba_tlv(skb, params, enable, false, NULL, wtbl_hdr);



	return __mt76_mcu_skb_send_msg(&dev->mt76, skb,

				       MCU_EXT_CMD_WTBL_UPDATE, true);

	return mt76_mcu_skb_send_msg(&dev->mt76, skb, MCU_EXT_CMD_WTBL_UPDATE,

				     true);

}



static int
@@ -1383,7 +1383,7 @@ mt7615_mcu_wtbl_sta_add(struct mt7615_dev *dev, struct ieee80211_vif *vif, 
	cmd = enable ? MCU_EXT_CMD_WTBL_UPDATE : MCU_EXT_CMD_STA_REC_UPDATE;

	skb = enable ? wskb : sskb;



	err = __mt76_mcu_skb_send_msg(&dev->mt76, skb, cmd, true);

	err = mt76_mcu_skb_send_msg(&dev->mt76, skb, cmd, true);

	if (err < 0) {

		skb = enable ? sskb : wskb;

		dev_kfree_skb(skb);
@@ -1394,7 +1394,7 @@ mt7615_mcu_wtbl_sta_add(struct mt7615_dev *dev, struct ieee80211_vif *vif, 
	cmd = enable ? MCU_EXT_CMD_STA_REC_UPDATE : MCU_EXT_CMD_WTBL_UPDATE;

	skb = enable ? sskb : wskb;



	return __mt76_mcu_skb_send_msg(&dev->mt76, skb, cmd, true);

	return mt76_mcu_skb_send_msg(&dev->mt76, skb, cmd, true);

}



static const struct mt7615_mcu_ops wtbl_update_ops = {
@@ -1432,7 +1432,7 @@ mt7615_mcu_sta_ba(struct mt7615_dev *dev, 
					     &skb);

	mt7615_mcu_wtbl_ba_tlv(skb, params, enable, tx, sta_wtbl, wtbl_hdr);



	return __mt76_mcu_skb_send_msg(&dev->mt76, skb,

	return mt76_mcu_skb_send_msg(&dev->mt76, skb,

				     MCU_EXT_CMD_STA_REC_UPDATE, true);

}
@@ -1484,7 +1484,7 @@ mt7615_mcu_add_sta_cmd(struct mt7615_dev *dev, struct ieee80211_vif *vif, 
			mt7615_mcu_wtbl_ht_tlv(skb, sta, sta_wtbl, wtbl_hdr);

	}



	return __mt76_mcu_skb_send_msg(&dev->mt76, skb, cmd, true);

	return mt76_mcu_skb_send_msg(&dev->mt76, skb, cmd, true);

}



static int
@@ -1846,7 +1846,7 @@ mt7615_mcu_uni_tx_ba(struct mt7615_dev *dev, 
	mt7615_mcu_wtbl_ba_tlv(skb, params, enable, true, sta_wtbl,

			       wtbl_hdr);



	err =  __mt76_mcu_skb_send_msg(&dev->mt76, skb,

	err =  mt76_mcu_skb_send_msg(&dev->mt76, skb,

				     MCU_UNI_CMD_STA_REC_UPDATE, true);

	if (err < 0)

		return err;
@@ -1857,7 +1857,7 @@ mt7615_mcu_uni_tx_ba(struct mt7615_dev *dev, 


	mt7615_mcu_sta_ba_tlv(skb, params, enable, true);



	return __mt76_mcu_skb_send_msg(&dev->mt76, skb,

	return mt76_mcu_skb_send_msg(&dev->mt76, skb,

				     MCU_UNI_CMD_STA_REC_UPDATE, true);

}
@@ -1879,7 +1879,7 @@ mt7615_mcu_uni_rx_ba(struct mt7615_dev *dev, 


	mt7615_mcu_sta_ba_tlv(skb, params, enable, false);



	err = __mt76_mcu_skb_send_msg(&dev->mt76, skb,

	err = mt76_mcu_skb_send_msg(&dev->mt76, skb,

				    MCU_UNI_CMD_STA_REC_UPDATE, true);

	if (err < 0 || !enable)

		return err;
@@ -1898,7 +1898,7 @@ mt7615_mcu_uni_rx_ba(struct mt7615_dev *dev, 
	mt7615_mcu_wtbl_ba_tlv(skb, params, enable, false, sta_wtbl,

			       wtbl_hdr);



	return __mt76_mcu_skb_send_msg(&dev->mt76, skb,

	return mt76_mcu_skb_send_msg(&dev->mt76, skb,

				     MCU_UNI_CMD_STA_REC_UPDATE, true);

}
@@ -2546,7 +2546,7 @@ int mt7615_mcu_set_eeprom(struct mt7615_dev *dev) 
	skb_put_data(skb, &req_hdr, sizeof(req_hdr));

	skb_put_data(skb, eep + offset, eep_len);



	return __mt76_mcu_skb_send_msg(&dev->mt76, skb,

	return mt76_mcu_skb_send_msg(&dev->mt76, skb,

				     MCU_EXT_CMD_EFUSE_BUFFER_MODE, true);

}

EXPORT_SYMBOL_GPL(mt7615_mcu_set_eeprom);
@@ -3018,8 +3018,8 @@ int mt7615_mcu_set_channel_domain(struct mt7615_phy *phy) 
		skb_put_data(skb, &channel, sizeof(channel));

	}



	return __mt76_mcu_skb_send_msg(&dev->mt76, skb,

				       MCU_CMD_SET_CHAN_DOMAIN, false);

	return mt76_mcu_skb_send_msg(&dev->mt76, skb, MCU_CMD_SET_CHAN_DOMAIN,

				     false);

}



#define MT7615_SCAN_CHANNEL_TIME	60
@@ -3101,7 +3101,7 @@ int mt7615_mcu_hw_scan(struct mt7615_phy *phy, struct ieee80211_vif *vif, 
		req->scan_func = 1;

	}



	err = __mt76_mcu_skb_send_msg(&dev->mt76, skb, MCU_CMD_START_HW_SCAN,

	err = mt76_mcu_skb_send_msg(&dev->mt76, skb, MCU_CMD_START_HW_SCAN,

				    false);

	if (err < 0)

		clear_bit(MT76_HW_SCANNING, &phy->mt76->state);
@@ -3202,8 +3202,8 @@ int mt7615_mcu_sched_scan_req(struct mt7615_phy *phy, 
		memcpy(skb_put(skb, sreq->ie_len), sreq->ie, sreq->ie_len);

	}



	return __mt76_mcu_skb_send_msg(&dev->mt76, skb,

				       MCU_CMD_SCHED_SCAN_REQ, false);

	return mt76_mcu_skb_send_msg(&dev->mt76, skb, MCU_CMD_SCHED_SCAN_REQ,

				     false);

}



int mt7615_mcu_sched_scan_enable(struct mt7615_phy *phy,
@@ -3649,8 +3649,8 @@ mt7615_mcu_set_wow_pattern(struct mt7615_dev *dev, 
	memcpy(ptlv->pattern, pattern->pattern, pattern->pattern_len);

	memcpy(ptlv->mask, pattern->mask, pattern->pattern_len / 8);



	return __mt76_mcu_skb_send_msg(&dev->mt76, skb,

				       MCU_UNI_CMD_SUSPEND, true);

	return mt76_mcu_skb_send_msg(&dev->mt76, skb, MCU_UNI_CMD_SUSPEND,

				     true);

}



static int
@@ -3822,8 +3822,8 @@ int mt7615_mcu_update_gtk_rekey(struct ieee80211_hw *hw, 
	memcpy(gtk_tlv->kck, key->kck, NL80211_KCK_LEN);

	memcpy(gtk_tlv->replay_ctr, key->replay_ctr, NL80211_REPLAY_CTR_LEN);



	return __mt76_mcu_skb_send_msg(&dev->mt76, skb,

				       MCU_UNI_CMD_OFFLOAD, true);

	return mt76_mcu_skb_send_msg(&dev->mt76, skb, MCU_UNI_CMD_OFFLOAD,

				     true);

}

#endif /* CONFIG_PM */
@@ -3890,8 +3890,8 @@ int mt7615_mcu_update_arp_filter(struct ieee80211_hw *hw, 
		memcpy(addr, &info->arp_addr_list[i], sizeof(__be32));

	}



	return __mt76_mcu_skb_send_msg(&dev->mt76, skb,

				       MCU_UNI_CMD_OFFLOAD, true);

	return mt76_mcu_skb_send_msg(&dev->mt76, skb, MCU_UNI_CMD_OFFLOAD,

				     true);

}



int mt7615_mcu_set_p2p_oppps(struct ieee80211_hw *hw,

drivers/net/wireless/mediatek/mt76/mt7615/testmode.c

+2 −2
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ mt7615_tm_set_tx_power(struct mt7615_phy *phy) 
			data[ret - MT_EE_NIC_CONF_0] = tx_power[i];

	}



	return __mt76_mcu_skb_send_msg(&dev->mt76, skb,

	return mt76_mcu_skb_send_msg(&dev->mt76, skb,

				     MCU_EXT_CMD_SET_TX_POWER_CTRL, false);

}

drivers/net/wireless/mediatek/mt76/mt7915/mcu.c

+27 −26
Original line number Diff line number Diff line
@@ -396,7 +396,7 @@ mt7915_mcu_msg_send(struct mt76_dev *mdev, int cmd, const void *data, 
	if (!skb)

		return -ENOMEM;



	return __mt76_mcu_skb_send_msg(mdev, skb, cmd, wait_resp);

	return mt76_mcu_skb_send_msg(mdev, skb, cmd, wait_resp);

}



static void
@@ -1095,7 +1095,7 @@ int mt7915_mcu_add_bss_info(struct mt7915_phy *phy, 
			mt7915_mcu_bss_ext_tlv(skb, mvif);

	}



	return __mt76_mcu_skb_send_msg(&phy->dev->mt76, skb,

	return mt76_mcu_skb_send_msg(&phy->dev->mt76, skb,

				     MCU_EXT_CMD_BSS_INFO_UPDATE, true);

}
@@ -1177,7 +1177,7 @@ int mt7915_mcu_add_key(struct mt7915_dev *dev, struct ieee80211_vif *vif, 
	if (ret)

		return ret;



	return __mt76_mcu_skb_send_msg(&dev->mt76, skb,

	return mt76_mcu_skb_send_msg(&dev->mt76, skb,

				     MCU_EXT_CMD_STA_REC_UPDATE, true);

}
@@ -1257,7 +1257,7 @@ mt7915_mcu_sta_ba(struct mt7915_dev *dev, 
					     &skb);

	mt7915_mcu_wtbl_ba_tlv(skb, params, enable, tx, sta_wtbl, wtbl_hdr);



	ret = __mt76_mcu_skb_send_msg(&dev->mt76, skb,

	ret = mt76_mcu_skb_send_msg(&dev->mt76, skb,

				    MCU_EXT_CMD_STA_REC_UPDATE, true);

	if (ret)

		return ret;
@@ -1269,7 +1269,7 @@ mt7915_mcu_sta_ba(struct mt7915_dev *dev, 


	mt7915_mcu_sta_ba_tlv(skb, params, enable, tx);



	return __mt76_mcu_skb_send_msg(&dev->mt76, skb,

	return mt76_mcu_skb_send_msg(&dev->mt76, skb,

				     MCU_EXT_CMD_STA_REC_UPDATE, true);

}
@@ -1605,7 +1605,7 @@ mt7915_mcu_add_mu(struct mt7915_dev *dev, struct ieee80211_vif *vif, 
	/* starec muru */

	mt7915_mcu_sta_muru_tlv(skb, sta);



	return __mt76_mcu_skb_send_msg(&dev->mt76, skb,

	return mt76_mcu_skb_send_msg(&dev->mt76, skb,

				     MCU_EXT_CMD_STA_REC_UPDATE, true);

}
@@ -1773,7 +1773,8 @@ int mt7915_mcu_sta_update_hdr_trans(struct mt7915_dev *dev, 
	wtbl_hdr = mt7915_mcu_alloc_wtbl_req(dev, msta, WTBL_SET, NULL, &skb);

	mt7915_mcu_wtbl_hdr_trans_tlv(skb, vif, sta, NULL, wtbl_hdr);



	return __mt76_mcu_skb_send_msg(&dev->mt76, skb, MCU_EXT_CMD_WTBL_UPDATE, true);

	return mt76_mcu_skb_send_msg(&dev->mt76, skb, MCU_EXT_CMD_WTBL_UPDATE,

				     true);

}



int mt7915_mcu_add_smps(struct mt7915_dev *dev, struct ieee80211_vif *vif,
@@ -1796,7 +1797,7 @@ int mt7915_mcu_add_smps(struct mt7915_dev *dev, struct ieee80211_vif *vif, 
					     &skb);

	mt7915_mcu_wtbl_smps_tlv(skb, sta, sta_wtbl, wtbl_hdr);



	return __mt76_mcu_skb_send_msg(&dev->mt76, skb,

	return mt76_mcu_skb_send_msg(&dev->mt76, skb,

				     MCU_EXT_CMD_STA_REC_UPDATE, true);

}
@@ -2098,7 +2099,7 @@ mt7915_mcu_add_txbf(struct mt7915_dev *dev, struct ieee80211_vif *vif, 


		mt7915_mcu_sta_bfer_tlv(skb, sta, vif, phy, enable);



		r = __mt76_mcu_skb_send_msg(&dev->mt76, skb,

		r = mt76_mcu_skb_send_msg(&dev->mt76, skb,

					  MCU_EXT_CMD_STA_REC_UPDATE, true);

		if (r)

			return r;
@@ -2114,7 +2115,7 @@ mt7915_mcu_add_txbf(struct mt7915_dev *dev, struct ieee80211_vif *vif, 


		mt7915_mcu_sta_bfee_tlv(skb, sta, phy);



		r = __mt76_mcu_skb_send_msg(&dev->mt76, skb,

		r = mt76_mcu_skb_send_msg(&dev->mt76, skb,

					  MCU_EXT_CMD_STA_REC_UPDATE, true);

		if (r)

			return r;
@@ -2282,7 +2283,7 @@ int mt7915_mcu_add_rate_ctrl(struct mt7915_dev *dev, struct ieee80211_vif *vif, 


	mt7915_mcu_sta_rate_ctrl_tlv(skb, dev, vif, sta);



	return __mt76_mcu_skb_send_msg(&dev->mt76, skb,

	return mt76_mcu_skb_send_msg(&dev->mt76, skb,

				     MCU_EXT_CMD_STA_REC_UPDATE, true);

}
@@ -2370,7 +2371,7 @@ int mt7915_mcu_add_sta(struct mt7915_dev *dev, struct ieee80211_vif *vif, 
			mt7915_mcu_wtbl_ht_tlv(skb, sta, sta_wtbl, wtbl_hdr);

	}



	return __mt76_mcu_skb_send_msg(&dev->mt76, skb,

	return mt76_mcu_skb_send_msg(&dev->mt76, skb,

				     MCU_EXT_CMD_STA_REC_UPDATE, true);

}
@@ -2416,7 +2417,7 @@ int mt7915_mcu_set_fixed_rate(struct mt7915_dev *dev, 
		ra->phy.sgi = ra->phy.mcs * 15;



out:

	return __mt76_mcu_skb_send_msg(&dev->mt76, skb,

	return mt76_mcu_skb_send_msg(&dev->mt76, skb,

				     MCU_EXT_CMD_STA_REC_UPDATE, true);

}
@@ -2551,7 +2552,7 @@ int mt7915_mcu_add_beacon(struct ieee80211_hw *hw, 
	mt7915_mcu_beacon_cont(dev, rskb, skb, bcn, &offs);

	dev_kfree_skb(skb);



	return __mt76_mcu_skb_send_msg(&phy->dev->mt76, rskb,

	return mt76_mcu_skb_send_msg(&phy->dev->mt76, rskb,

				     MCU_EXT_CMD_BSS_INFO_UPDATE, true);

}