mt76: move alloc_device common code in mt76_alloc_device

Move mt76x{0,2} alloc_device common code in mt76_alloc_device and
remove duplicated code

Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi@redhat.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mac80211.c b/drivers/net/wireless/mediatek/mt76/mac80211.c
index ee3b65a14870ce742ba559d5e83f9475418b989e..c7abf4f54867a07626e75b0138c84e3d5611661e 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mac80211.c
+++ b/drivers/net/wireless/mediatek/mt76/mac80211.c
@@ -269,7 +269,9 @@ mt76_check_sband(struct mt76_dev *dev, int band)
 }
 
 struct mt76_dev *
-mt76_alloc_device(unsigned int size, const struct ieee80211_ops *ops)
+mt76_alloc_device(struct device *pdev, unsigned int size,
+                 const struct ieee80211_ops *ops,
+                 const struct mt76_driver_ops *drv_ops)
 {
        struct ieee80211_hw *hw;
        struct mt76_dev *dev;
@@ -280,6 +282,9 @@ mt76_alloc_device(unsigned int size, const struct ieee80211_ops *ops)
 
        dev = hw->priv;
        dev->hw = hw;
+       dev->dev = pdev;
+       dev->drv = drv_ops;
+
        spin_lock_init(&dev->rx_lock);
        spin_lock_init(&dev->lock);
        spin_lock_init(&dev->cc_lock);

diff --git a/drivers/net/wireless/mediatek/mt76/mt76.h b/drivers/net/wireless/mediatek/mt76/mt76.h
index 3894d72d40169d27a78cff9fd7777d614c815fa8..e9cc108e60d3ba3da32dabf3179b00e6690b2927 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76.h
@@ -585,8 +585,9 @@ mt76_channel_state(struct mt76_dev *dev, struct ieee80211_channel *c)
        return &msband->chan[idx];
 }
 
-struct mt76_dev *mt76_alloc_device(unsigned int size,
-                                  const struct ieee80211_ops *ops);
+struct mt76_dev *mt76_alloc_device(struct device *pdev, unsigned int size,
+                                  const struct ieee80211_ops *ops,
+                                  const struct mt76_driver_ops *drv_ops);
 int mt76_register_device(struct mt76_dev *dev, bool vht,
                         struct ieee80211_rate *rates, int n_rates);
 void mt76_unregister_device(struct mt76_dev *dev);

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x0/init.c b/drivers/net/wireless/mediatek/mt76/mt76x0/init.c
index 87b575fe1c74f216bd3e293a290afff32860b8df..34db3ec24e6e66d2d4645f7c57a8e9c45aee1cfd 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x0/init.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x0/init.c
@@ -270,13 +270,10 @@ mt76x0_alloc_device(struct device *pdev,
        struct mt76x02_dev *dev;
        struct mt76_dev *mdev;
 
-       mdev = mt76_alloc_device(sizeof(*dev), ops);
+       mdev = mt76_alloc_device(pdev, sizeof(*dev), ops, drv_ops);
        if (!mdev)
                return NULL;
 
-       mdev->dev = pdev;
-       mdev->drv = drv_ops;
-
        dev = container_of(mdev, struct mt76x02_dev, mt76);
        mutex_init(&dev->phy_mutex);
 

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/pci_init.c b/drivers/net/wireless/mediatek/mt76/mt76x2/pci_init.c
index 0ccaa64d97ec07d2b2b86d314e9043eb373ce7f9..d5816c7f359f95df80e2ee9f2acb93f12365bcfe 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x2/pci_init.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x2/pci_init.c
@@ -329,13 +329,12 @@ struct mt76x02_dev *mt76x2_alloc_device(struct device *pdev)
        struct mt76x02_dev *dev;
        struct mt76_dev *mdev;
 
-       mdev = mt76_alloc_device(sizeof(*dev), &mt76x2_ops);
+       mdev = mt76_alloc_device(pdev, sizeof(*dev), &mt76x2_ops,
+                                &drv_ops);
        if (!mdev)
                return NULL;
 
        dev = container_of(mdev, struct mt76x02_dev, mt76);
-       mdev->dev = pdev;
-       mdev->drv = &drv_ops;
 
        return dev;
 }

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/usb_init.c b/drivers/net/wireless/mediatek/mt76/mt76x2/usb_init.c
index 3737e9fa8295a1b26388b43e5eb6721b1b384f39..11ce106391e19419dc69a083480b310e1323e52b 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x2/usb_init.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x2/usb_init.c
@@ -147,13 +147,12 @@ struct mt76x02_dev *mt76x2u_alloc_device(struct device *pdev)
        struct mt76x02_dev *dev;
        struct mt76_dev *mdev;
 
-       mdev = mt76_alloc_device(sizeof(*dev), &mt76x2u_ops);
+       mdev = mt76_alloc_device(pdev, sizeof(*dev), &mt76x2u_ops,
+                                &drv_ops);
        if (!mdev)
                return NULL;
 
        dev = container_of(mdev, struct mt76x02_dev, mt76);
-       mdev->dev = pdev;
-       mdev->drv = &drv_ops;
 
        return dev;
 }