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: Stanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x0/main.c b/drivers/net/wireless/mediatek/mt76/mt76x0/main.c
index 3bc665643e51cd6176a4de3680f685190ca77f81..efb7ca93863d3b4d4847195985d58f96ed79c2ea 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x0/main.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x0/main.c
@@ -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);

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x0/mt76x0.h b/drivers/net/wireless/mediatek/mt76/mt76x0/mt76x0.h
index caa87f0c3cb834b503421c922dcd8afc0951b917..26517e062bdbe04a9536fef4980631020993f7bb 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x0/mt76x0.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76x0/mt76x0.h
@@ -54,8 +54,8 @@ 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,
-                          struct cfg80211_chan_def *chandef);
+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);
 #endif

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x0/phy.c b/drivers/net/wireless/mediatek/mt76/mt76x0/phy.c
index 1d00aa5da95b00fbd1e8acd6106e2cfcaeeb972f..711a352dfd5c97e01d8cdef1ed251d9c4e9cf303 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x0/phy.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x0/phy.c
@@ -909,8 +909,8 @@ 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,
-                          struct cfg80211_chan_def *chandef)
+void mt76x0_phy_set_channel(struct mt76x02_dev *dev,
+                           struct cfg80211_chan_def *chandef)
 {
        u32 ext_cca_chan[4] = {
                [0] = FIELD_PREP(MT_EXT_CCA_CFG_CCA0, 0) |
@@ -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)