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

wifi: mt76: mt792x: move MT7921_PM_TIMEOUT and MT7921_HW_SCAN_TIMEOUT in common code 



MT7921_PM_TIMEOUT is shared between mt7925 and mt7921 so move it in
mt792x module.

Signed-off-by: default avatarLorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: default avatarDeren Wu <deren.wu@mediatek.com>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent 81d4c943

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

+1 −1
Original line number Diff line number Diff line
@@ -217,7 +217,7 @@ int mt7921_register_device(struct mt792x_dev *dev) 
	timer_setup(&dev->phy.roc_timer, mt792x_roc_timer, 0);

	init_waitqueue_head(&dev->phy.roc_wait);



	dev->pm.idle_timeout = MT7921_PM_TIMEOUT;

	dev->pm.idle_timeout = MT792x_PM_TIMEOUT;

	dev->pm.stats.last_wake_event = jiffies;

	dev->pm.stats.last_doze_event = jiffies;

	if (!mt76_is_usb(&dev->mt76)) {

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

+1 −1
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ mt7921_mcu_scan_event(struct mt792x_dev *dev, struct sk_buff *skb) 
	spin_unlock_bh(&dev->mt76.lock);



	ieee80211_queue_delayed_work(mphy->hw, &phy->scan_work,

				     MT7921_HW_SCAN_TIMEOUT);

				     MT792x_HW_SCAN_TIMEOUT);

}



static void

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

+0 −3
Original line number Diff line number Diff line
@@ -7,9 +7,6 @@ 
#include "../mt792x.h"

#include "regs.h"



#define MT7921_PM_TIMEOUT		(HZ / 12)

#define MT7921_HW_SCAN_TIMEOUT		(HZ / 10)



#define MT7921_TX_RING_SIZE		2048

#define MT7921_TX_MCU_RING_SIZE		256

#define MT7921_TX_FWDL_RING_SIZE	128

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

+3 −0
Original line number Diff line number Diff line
@@ -11,6 +11,9 @@ 
#include "mt792x_regs.h"

#include "mt792x_acpi_sar.h"



#define MT792x_PM_TIMEOUT	(HZ / 12)

#define MT792x_HW_SCAN_TIMEOUT	(HZ / 10)



#define MT792x_MAX_INTERFACES	4

#define MT792x_WTBL_SIZE	20

#define MT792x_WTBL_RESERVED	(MT792x_WTBL_SIZE - 1)