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

Commit 2858f60a authored by Felix Fietkau's avatar Felix Fietkau
Browse files

mt76: mt76x2: unify mt76x2[u]_mac_resume 



They are now the same and short enough to be turned into an inline function

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

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

+7 −1
Original line number Diff line number Diff line
@@ -25,6 +25,12 @@ struct mt76x02_vif; 


int mt76x2_mac_start(struct mt76x02_dev *dev);

void mt76x2_mac_stop(struct mt76x02_dev *dev, bool force);

void mt76x2_mac_resume(struct mt76x02_dev *dev);



static inline void mt76x2_mac_resume(struct mt76x02_dev *dev)

{

	mt76_wr(dev, MT_MAC_SYS_CTRL,

		MT_MAC_SYS_CTRL_ENABLE_TX |

		MT_MAC_SYS_CTRL_ENABLE_RX);

}



#endif

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

+0 −1
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ void mt76x2u_cleanup(struct mt76x02_dev *dev); 
void mt76x2u_stop_hw(struct mt76x02_dev *dev);



int mt76x2u_mac_reset(struct mt76x02_dev *dev);

void mt76x2u_mac_resume(struct mt76x02_dev *dev);

int mt76x2u_mac_start(struct mt76x02_dev *dev);

int mt76x2u_mac_stop(struct mt76x02_dev *dev);

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

+0 −7
Original line number Diff line number Diff line
@@ -173,13 +173,6 @@ int mt76x2_mac_start(struct mt76x02_dev *dev) 
	return 0;

}



void mt76x2_mac_resume(struct mt76x02_dev *dev)

{

	mt76_wr(dev, MT_MAC_SYS_CTRL,

		MT_MAC_SYS_CTRL_ENABLE_TX |

		MT_MAC_SYS_CTRL_ENABLE_RX);

}



static void

mt76x2_power_on_rf_patch(struct mt76x02_dev *dev)

{

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

+0 −7
Original line number Diff line number Diff line
@@ -211,10 +211,3 @@ int mt76x2u_mac_stop(struct mt76x02_dev *dev) 


	return 0;

}
 


void mt76x2u_mac_resume(struct mt76x02_dev *dev)

{

	mt76_wr(dev, MT_MAC_SYS_CTRL,

		MT_MAC_SYS_CTRL_ENABLE_TX |

		MT_MAC_SYS_CTRL_ENABLE_RX);

}

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

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ mt76x2u_set_channel(struct mt76x02_dev *dev, 


	err = mt76x2u_phy_set_channel(dev, chandef);



	mt76x2u_mac_resume(dev);

	mt76x2_mac_resume(dev);

	mt76x02_edcca_init(dev, true);



	clear_bit(MT76_RESET, &dev->mt76.state);