Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c6950536 authored by Stanislaw Gruszka's avatar Stanislaw Gruszka Committed by Felix Fietkau
Browse files

mt76: remove wait argument from mt76x02_mcu_set_radio_state 



Remove wait argument from mt76x02_mcu_set_radio_state and newer wait
for response when sending CMD_POWER_SAVING_OP mcu command.
Note this change behaviour for PCIe devices, but the change is in
align with vendor driver.

Signed-off-by: default avatarStanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent 3d2d61b5

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

+2 −4
Original line number Diff line number Diff line
@@ -151,8 +151,7 @@ int mt76x02_mcu_function_select(struct mt76x02_dev *dev, enum mcu_function func, 
}

EXPORT_SYMBOL_GPL(mt76x02_mcu_function_select);



int mt76x02_mcu_set_radio_state(struct mt76x02_dev *dev, bool on,

				bool wait_resp)

int mt76x02_mcu_set_radio_state(struct mt76x02_dev *dev, bool on)

{

	struct {

		__le32 mode;
@@ -162,8 +161,7 @@ int mt76x02_mcu_set_radio_state(struct mt76x02_dev *dev, bool on, 
		.level = cpu_to_le32(0),

	};



	return mt76_mcu_send_msg(dev, CMD_POWER_SAVING_OP, &msg, sizeof(msg),

				 wait_resp);

	return mt76_mcu_send_msg(dev, CMD_POWER_SAVING_OP, &msg, sizeof(msg), false);

}

EXPORT_SYMBOL_GPL(mt76x02_mcu_set_radio_state);

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

+1 −2
Original line number Diff line number Diff line
@@ -103,8 +103,7 @@ int mt76x02_mcu_msg_send(struct mt76_dev *mdev, int cmd, const void *data, 
			 int len, bool wait_resp);

int mt76x02_mcu_function_select(struct mt76x02_dev *dev, enum mcu_function func,

				u32 val);

int mt76x02_mcu_set_radio_state(struct mt76x02_dev *dev, bool on,

				bool wait_resp);

int mt76x02_mcu_set_radio_state(struct mt76x02_dev *dev, bool on);

void mt76x02_set_ethtool_fwver(struct mt76x02_dev *dev,

			       const struct mt76x02_fw_header *h);

drivers/net/wireless/mediatek/mt76/mt76x2/pci_init.c

+1 −1
Original line number Diff line number Diff line
@@ -300,7 +300,7 @@ void mt76x2_stop_hardware(struct mt76x02_dev *dev) 
{

	cancel_delayed_work_sync(&dev->cal_work);

	cancel_delayed_work_sync(&dev->mac_work);

	mt76x02_mcu_set_radio_state(dev, false, true);

	mt76x02_mcu_set_radio_state(dev, false);

	mt76x2_mac_stop(dev, false);

}

drivers/net/wireless/mediatek/mt76/mt76x2/pci_phy.c

+1 −1
Original line number Diff line number Diff line
@@ -305,7 +305,7 @@ int mt76x2_phy_start(struct mt76x02_dev *dev) 
{

	int ret;



	ret = mt76x02_mcu_set_radio_state(dev, true, true);

	ret = mt76x02_mcu_set_radio_state(dev, true);

	if (ret)

		return ret;

drivers/net/wireless/mediatek/mt76/mt76x2/usb_init.c

+1 −1
Original line number Diff line number Diff line
@@ -292,7 +292,7 @@ void mt76x2u_stop_hw(struct mt76x02_dev *dev) 


void mt76x2u_cleanup(struct mt76x02_dev *dev)

{

	mt76x02_mcu_set_radio_state(dev, false, false);

	mt76x02_mcu_set_radio_state(dev, false);

	mt76x2u_stop_hw(dev);

	mt76u_queues_deinit(&dev->mt76);

	mt76u_mcu_deinit(&dev->mt76);