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

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

mt76: mt76x0: remove unneeded return value on set channel 



We allways return 0 from mt76x0_phy_set_channel(), no need to pass
return value upward.

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

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

+4 −9
Original line number Diff line number Diff line
@@ -8,18 +8,16 @@ 
#include <linux/etherdevice.h>

#include "mt76x0.h"



static int

static void

mt76x0_set_channel(struct mt76x02_dev *dev, struct cfg80211_chan_def *chandef)

{

	int ret;



	cancel_delayed_work_sync(&dev->cal_work);

	mt76x02_pre_tbtt_enable(dev, false);

	if (mt76_is_mmio(dev))

		tasklet_disable(&dev->dfs_pd.dfs_tasklet);



	mt76_set_channel(&dev->mt76);

	ret = mt76x0_phy_set_channel(dev, chandef);

	mt76x0_phy_set_channel(dev, chandef);



	/* channel cycle counters read-and-clear */

	mt76_rr(dev, MT_CH_IDLE);
@@ -34,20 +32,17 @@ mt76x0_set_channel(struct mt76x02_dev *dev, struct cfg80211_chan_def *chandef) 
	mt76x02_pre_tbtt_enable(dev, true);



	mt76_txq_schedule_all(&dev->mt76);



	return ret;

}



int mt76x0_config(struct ieee80211_hw *hw, u32 changed)

{

	struct mt76x02_dev *dev = hw->priv;

	int ret = 0;



	mutex_lock(&dev->mt76.mutex);



	if (changed & IEEE80211_CONF_CHANGE_CHANNEL) {

		ieee80211_stop_queues(hw);

		ret = mt76x0_set_channel(dev, &hw->conf.chandef);

		mt76x0_set_channel(dev, &hw->conf.chandef);

		ieee80211_wake_queues(hw);

	}
@@ -69,6 +64,6 @@ int mt76x0_config(struct ieee80211_hw *hw, u32 changed) 


	mutex_unlock(&dev->mt76.mutex);



	return ret;

	return 0;

}

EXPORT_SYMBOL_GPL(mt76x0_config);

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

+2 −2
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ int mt76x0_config(struct ieee80211_hw *hw, u32 changed); 
/* PHY */

void mt76x0_phy_init(struct mt76x02_dev *dev);

int mt76x0_phy_wait_bbp_ready(struct mt76x02_dev *dev);

int mt76x0_phy_set_channel(struct mt76x02_dev *dev,

void mt76x0_phy_set_channel(struct mt76x02_dev *dev,

			    struct cfg80211_chan_def *chandef);

void mt76x0_phy_set_txpower(struct mt76x02_dev *dev);

void mt76x0_phy_calibrate(struct mt76x02_dev *dev, bool power_on);

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

+3 −5
Original line number Diff line number Diff line
@@ -909,7 +909,7 @@ void mt76x0_phy_calibrate(struct mt76x02_dev *dev, bool power_on) 
}

EXPORT_SYMBOL_GPL(mt76x0_phy_calibrate);



int mt76x0_phy_set_channel(struct mt76x02_dev *dev,

void mt76x0_phy_set_channel(struct mt76x02_dev *dev,

			    struct cfg80211_chan_def *chandef)

{

	u32 ext_cca_chan[4] = {
@@ -1004,7 +1004,7 @@ int mt76x0_phy_set_channel(struct mt76x02_dev *dev, 
	/* enable vco */

	mt76x0_rf_set(dev, MT_RF(0, 4), BIT(7));

	if (scan)

		return 0;

		return;



	mt76x02_init_agc_gain(dev);

	mt76x0_phy_calibrate(dev, false);
@@ -1012,8 +1012,6 @@ int mt76x0_phy_set_channel(struct mt76x02_dev *dev, 


	ieee80211_queue_delayed_work(dev->mt76.hw, &dev->cal_work,

				     MT_CALIBRATE_INTERVAL);



	return 0;

}



static void mt76x0_phy_temp_sensor(struct mt76x02_dev *dev)