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

wifi: mt76: move mt76_rate_power from core to mt76x02 driver code 



Its layout and code is mt76x02 specific

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

drivers/net/wireless/mediatek/mt76/debugfs.c

+0 −19
Original line number Diff line number Diff line
@@ -100,23 +100,6 @@ void mt76_seq_puts_array(struct seq_file *file, const char *str, 
}

EXPORT_SYMBOL_GPL(mt76_seq_puts_array);



static int mt76_read_rate_txpower(struct seq_file *s, void *data)

{

	struct mt76_dev *dev = dev_get_drvdata(s->private);



	mt76_seq_puts_array(s, "CCK", dev->rate_power.cck,

			    ARRAY_SIZE(dev->rate_power.cck));

	mt76_seq_puts_array(s, "OFDM", dev->rate_power.ofdm,

			    ARRAY_SIZE(dev->rate_power.ofdm));

	mt76_seq_puts_array(s, "STBC", dev->rate_power.stbc,

			    ARRAY_SIZE(dev->rate_power.stbc));

	mt76_seq_puts_array(s, "HT", dev->rate_power.ht,

			    ARRAY_SIZE(dev->rate_power.ht));

	mt76_seq_puts_array(s, "VHT", dev->rate_power.vht,

			    ARRAY_SIZE(dev->rate_power.vht));

	return 0;

}



struct dentry *

mt76_register_debugfs_fops(struct mt76_phy *phy,

			   const struct file_operations *ops)
@@ -137,8 +120,6 @@ mt76_register_debugfs_fops(struct mt76_phy *phy, 
	debugfs_create_blob("eeprom", 0400, dir, &dev->eeprom);

	if (dev->otp.data)

		debugfs_create_blob("otp", 0400, dir, &dev->otp);

	debugfs_create_devm_seqfile(dev->dev, "rate_txpower", dir,

				    mt76_read_rate_txpower);

	debugfs_create_devm_seqfile(dev->dev, "rx-queues", dir,

				    mt76_rx_queues_read);

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

+0 −15
Original line number Diff line number Diff line
@@ -470,19 +470,6 @@ struct mt76_sband { 
	struct mt76_channel_state *chan;

};



struct mt76_rate_power {

	union {

		struct {

			s8 cck[4];

			s8 ofdm[8];

			s8 stbc[10];

			s8 ht[16];

			s8 vht[10];

		};

		s8 all[48];

	};

};



/* addr req mask */

#define MT_VEND_TYPE_EEPROM	BIT(31)

#define MT_VEND_TYPE_CFG	BIT(30)
@@ -802,8 +789,6 @@ struct mt76_dev { 
	struct debugfs_blob_wrapper eeprom;

	struct debugfs_blob_wrapper otp;



	struct mt76_rate_power rate_power;



	char alpha2[3];

	enum nl80211_dfs_regions region;

drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.c

+2 −2
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ static s8 mt76x0_get_delta(struct mt76x02_dev *dev) 


void mt76x0_get_tx_power_per_rate(struct mt76x02_dev *dev,

				  struct ieee80211_channel *chan,

				  struct mt76_rate_power *t)

				  struct mt76x02_rate_power *t)

{

	bool is_2ghz = chan->band == NL80211_BAND_2GHZ;

	u16 val, addr;
@@ -235,7 +235,7 @@ void mt76x0_get_power_info(struct mt76x02_dev *dev, 
			data = mt76x02_eeprom_get(dev, MT_EE_5G_TARGET_POWER);

		else

			data = mt76x02_eeprom_get(dev, MT_EE_2G_TARGET_POWER);

		target_power = (data & 0xff) - dev->mt76.rate_power.ofdm[7];

		target_power = (data & 0xff) - dev->rate_power.ofdm[7];

		*tp = target_power + mt76x0_get_delta(dev);



		return;

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

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ int mt76x0_eeprom_init(struct mt76x02_dev *dev); 
void mt76x0_read_rx_gain(struct mt76x02_dev *dev);

void mt76x0_get_tx_power_per_rate(struct mt76x02_dev *dev,

				  struct ieee80211_channel *chan,

				  struct mt76_rate_power *t);

				  struct mt76x02_rate_power *t);

void mt76x0_get_power_info(struct mt76x02_dev *dev,

			   struct ieee80211_channel *chan, s8 *tp);

drivers/net/wireless/mediatek/mt76/mt76x0/init.c

+1 −1
Original line number Diff line number Diff line
@@ -217,7 +217,7 @@ mt76x0_init_txpower(struct mt76x02_dev *dev, 
		    struct ieee80211_supported_band *sband)

{

	struct ieee80211_channel *chan;

	struct mt76_rate_power t;

	struct mt76x02_rate_power t;

	s8 tp;

	int i;