Commit a8333801 authored by Lorenzo Bianconi's avatar Lorenzo Bianconi Committed by Felix Fietkau
Browse files

mt76: mt7921: move hw configuration in mt7921_register_device 



Get rid of init work since firmware loading is already performed in
mt7921_init_hardware

Signed-off-by: default avatarLorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent 495184ac

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

+6 −12
Original line number Diff line number Diff line
@@ -166,20 +166,10 @@ void mt7921_mac_init(struct mt7921_dev *dev) 
	mt76_connac_mcu_set_rts_thresh(&dev->mt76, 0x92b, 0);

}



static void mt7921_init_work(struct work_struct *work)

{

	struct mt7921_dev *dev = container_of(work, struct mt7921_dev,

				 init_work);



	mt7921_mcu_set_eeprom(dev);

	mt7921_mac_init(dev);

}



static int mt7921_init_hardware(struct mt7921_dev *dev)

{

	int ret, idx;



	INIT_WORK(&dev->init_work, mt7921_init_work);

	spin_lock_init(&dev->token_lock);

	idr_init(&dev->token);
@@ -202,6 +192,10 @@ static int mt7921_init_hardware(struct mt7921_dev *dev) 
	if (ret < 0)

		return ret;



	ret = mt7921_mcu_set_eeprom(dev);

	if (ret)

		return ret;



	/* Beacon and mgmt frames should occupy wcid 0 */

	idx = mt76_wcid_alloc(dev->mt76.wcid_mask, MT7921_WTBL_STA - 1);

	if (idx)
@@ -212,6 +206,8 @@ static int mt7921_init_hardware(struct mt7921_dev *dev) 
	dev->mt76.global_wcid.tx_info |= MT_WCID_TX_INFO_SET;

	rcu_assign_pointer(dev->mt76.wcid[idx], &dev->mt76.global_wcid);



	mt7921_mac_init(dev);



	return 0;

}
@@ -266,8 +262,6 @@ int mt7921_register_device(struct mt7921_dev *dev) 
	if (ret)

		return ret;



	ieee80211_queue_work(mt76_hw(dev), &dev->init_work);



	return mt7921_init_debugfs(dev);

}

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

+0 −1
Original line number Diff line number Diff line
@@ -156,7 +156,6 @@ struct mt7921_dev { 


	u16 chainmask;



	struct work_struct init_work;

	struct work_struct reset_work;



	struct list_head sta_poll_list;