mt76: mt7615: remove useless MT_HW_RDD0/1 enum

Writing 0/1 is shorter and just as clear

Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/init.c b/drivers/net/wireless/mediatek/mt76/mt7615/init.c
index 9dcc3b26ff33e02445cb0a907f36d76c455a18dc..8d80aaf9723a5f994330c64c5ab182647e5d7429 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7615/init.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/init.c
@@ -257,8 +257,7 @@ mt7615_regd_notifier(struct wiphy *wiphy,
 
        mt7615_dfs_stop_radar_detector(dev);
        if (request->dfs_region == NL80211_DFS_UNSET)
-               mt7615_mcu_rdd_cmd(dev, RDD_CAC_END, MT_HW_RDD0,
-                                  MT_RX_SEL0, 0);
+               mt7615_mcu_rdd_cmd(dev, RDD_CAC_END, 0, MT_RX_SEL0, 0);
        else
                mt7615_dfs_start_radar_detector(dev);
 }

diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mac.c b/drivers/net/wireless/mediatek/mt76/mt7615/mac.c
index 71b3de5c810c44436020329683c638dc2724113b..8223c7fa1c65f3ce48aba92003d6384d68026519 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7615/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/mac.c
@@ -1502,15 +1502,13 @@ int mt7615_dfs_stop_radar_detector(struct mt7615_dev *dev)
        struct cfg80211_chan_def *chandef = &dev->mphy.chandef;
        int err;
 
-       err = mt7615_mcu_rdd_cmd(dev, RDD_STOP, MT_HW_RDD0,
-                                MT_RX_SEL0, 0);
+       err = mt7615_mcu_rdd_cmd(dev, RDD_STOP, 0, MT_RX_SEL0, 0);
        if (err < 0)
                return err;
 
        if (chandef->width == NL80211_CHAN_WIDTH_160 ||
            chandef->width == NL80211_CHAN_WIDTH_80P80)
-               err = mt7615_mcu_rdd_cmd(dev, RDD_STOP, MT_HW_RDD1,
-                                        MT_RX_SEL0, 0);
+               err = mt7615_mcu_rdd_cmd(dev, RDD_STOP, 1, MT_RX_SEL0, 0);
        return err;
 }
 
@@ -1532,20 +1530,19 @@ int mt7615_dfs_start_radar_detector(struct mt7615_dev *dev)
        int err;
 
        /* start CAC */
-       err = mt7615_mcu_rdd_cmd(dev, RDD_CAC_START, MT_HW_RDD0,
-                                MT_RX_SEL0, 0);
+       err = mt7615_mcu_rdd_cmd(dev, RDD_CAC_START, 0, MT_RX_SEL0, 0);
        if (err < 0)
                return err;
 
        /* TODO: DBDC support */
 
-       err = mt7615_dfs_start_rdd(dev, MT_HW_RDD0);
+       err = mt7615_dfs_start_rdd(dev, 0);
        if (err < 0)
                return err;
 
        if (chandef->width == NL80211_CHAN_WIDTH_160 ||
            chandef->width == NL80211_CHAN_WIDTH_80P80) {
-               err = mt7615_dfs_start_rdd(dev, MT_HW_RDD1);
+               err = mt7615_dfs_start_rdd(dev, 1);
                if (err < 0)
                        return err;
        }
@@ -1572,15 +1569,13 @@ int mt7615_dfs_init_radar_detector(struct mt7615_dev *dev)
        if (chandef->chan->flags & IEEE80211_CHAN_RADAR) {
                if (chandef->chan->dfs_state != NL80211_DFS_AVAILABLE)
                        return mt7615_dfs_start_radar_detector(dev);
-               else
-                       return mt7615_mcu_rdd_cmd(dev, RDD_CAC_END, MT_HW_RDD0,
-                                                 MT_RX_SEL0, 0);
-       } else {
-               err = mt7615_mcu_rdd_cmd(dev, RDD_NORMAL_START,
-                                        MT_HW_RDD0, MT_RX_SEL0, 0);
-               if (err < 0)
-                       return err;
 
-               return mt7615_dfs_stop_radar_detector(dev);
+               return mt7615_mcu_rdd_cmd(dev, RDD_CAC_END, 0, MT_RX_SEL0, 0);
        }
+
+       err = mt7615_mcu_rdd_cmd(dev, RDD_NORMAL_START, 0, MT_RX_SEL0, 0);
+       if (err < 0)
+               return err;
+
+       return mt7615_dfs_stop_radar_detector(dev);
 }

diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h b/drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h
index 88e903324f078e84280357fd599b605b0271b1d7..bd9014421b0050e954f772082dada810b80531bc 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h
@@ -149,11 +149,6 @@ enum {
        EXT_BSSID_END
 };
 
-enum {
-       MT_HW_RDD0,
-       MT_HW_RDD1,
-};
-
 enum {
        MT_RX_SEL0,
        MT_RX_SEL1,