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

Commit c0f7b25a authored by Lorenzo Bianconi's avatar Lorenzo Bianconi Committed by Felix Fietkau
Browse files

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: default avatarLorenzo Bianconi <lorenzo.bianconi@redhat.com>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent f1906fb2

drivers/net/wireless/mediatek/mt76/mac80211.c

+6 −1
Original line number Diff line number Diff line
@@ -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);

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

+3 −2
Original line number Diff line number Diff line
@@ -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);

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

+1 −4
Original line number Diff line number Diff line
@@ -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);

drivers/net/wireless/mediatek/mt76/mt76x2/pci_init.c

+2 −3
Original line number Diff line number Diff line
@@ -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;

}

drivers/net/wireless/mediatek/mt76/mt76x2/usb_init.c

+2 −3
Original line number Diff line number Diff line
@@ -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;

}