mt76: mt7615: introduce mt7615_init_device routine

Add mt7615_init_device routine in order to be reused adding support for
mt7663 in mt7615 driver

Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
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 4c41e4048161b39e5df939aac3162ecc1c642cde..40e9bf5f4a35e54f8bb27a0dcc76f7c94ce6b918 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7615/init.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/init.c
@@ -429,11 +429,9 @@ void mt7615_unregister_ext_phy(struct mt7615_dev *dev)
        ieee80211_free_hw(mphy->hw);
 }
 
-
-int mt7615_register_device(struct mt7615_dev *dev)
+void mt7615_init_device(struct mt7615_dev *dev)
 {
        struct ieee80211_hw *hw = mt76_hw(dev);
-       int ret;
 
        dev->phy.dev = dev;
        dev->phy.mt76 = &dev->mt76.phy;
@@ -444,14 +442,6 @@ int mt7615_register_device(struct mt7615_dev *dev)
        init_waitqueue_head(&dev->reset_wait);
        INIT_WORK(&dev->reset_work, mt7615_mac_reset_work);
 
-       ret = mt7622_wmac_init(dev);
-       if (ret)
-               return ret;
-
-       ret = mt7615_init_hardware(dev);
-       if (ret)
-               return ret;
-
        mt7615_init_wiphy(hw);
        dev->mphy.sband_2g.sband.ht_cap.cap |= IEEE80211_HT_CAP_LDPC_CODING;
        dev->mphy.sband_5g.sband.ht_cap.cap |= IEEE80211_HT_CAP_LDPC_CODING;
@@ -460,6 +450,13 @@ int mt7615_register_device(struct mt7615_dev *dev)
                        IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_MASK;
        mt7615_cap_dbdc_disable(dev);
        dev->phy.dfs_state = -1;
+}
+
+int mt7615_register_device(struct mt7615_dev *dev)
+{
+       int ret;
+
+       mt7615_init_device(dev);
 
        /* init led callbacks */
        if (IS_ENABLED(CONFIG_MT76_LEDS)) {
@@ -467,6 +464,14 @@ int mt7615_register_device(struct mt7615_dev *dev)
                dev->mt76.led_cdev.blink_set = mt7615_led_set_blink;
        }
 
+       ret = mt7622_wmac_init(dev);
+       if (ret)
+               return ret;
+
+       ret = mt7615_init_hardware(dev);
+       if (ret)
+               return ret;
+
        ret = mt76_register_device(&dev->mt76, true, mt7615_rates,
                                   ARRAY_SIZE(mt7615_rates));
        if (ret)

diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h b/drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h
index 2b7cee4da519db06f256e219634fb062ad9d3bb3..cc5aa2abb4622ef34260bc6c850802ddae232d9b 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h
@@ -272,6 +272,7 @@ static inline int mt7622_wmac_init(struct mt7615_dev *dev)
 int mt7615_mmio_probe(struct device *pdev, void __iomem *mem_base, int irq);
 u32 mt7615_reg_map(struct mt7615_dev *dev, u32 addr);
 
+void mt7615_init_device(struct mt7615_dev *dev);
 int mt7615_register_device(struct mt7615_dev *dev);
 void mt7615_unregister_device(struct mt7615_dev *dev);
 int mt7615_register_ext_phy(struct mt7615_dev *dev);