Commit e5443256 authored by Felix Fietkau's avatar Felix Fietkau
Browse files

mt76: move initialization of some struct members to mt76_alloc_device 



Reduces duplication and prepares for further rework

Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent aa7619a3

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

+0 −1
Original line number Diff line number Diff line
@@ -555,7 +555,6 @@ mt76_dma_init(struct mt76_dev *dev) 
		netif_napi_add(&dev->napi_dev, &dev->napi[i], mt76_dma_rx_poll,

			       64);

		mt76_dma_rx_fill(dev, &dev->q_rx[i]);

		skb_queue_head_init(&dev->rx_skb[i]);

		napi_enable(&dev->napi[i]);

	}

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

+6 −2
Original line number Diff line number Diff line
@@ -275,6 +275,7 @@ mt76_alloc_device(struct device *pdev, unsigned int size, 
{

	struct ieee80211_hw *hw;

	struct mt76_dev *dev;

	int i;



	hw = ieee80211_alloc_hw(size, ops);

	if (!hw)
@@ -292,6 +293,11 @@ mt76_alloc_device(struct device *pdev, unsigned int size, 
	init_waitqueue_head(&dev->tx_wait);

	skb_queue_head_init(&dev->status_list);



	INIT_LIST_HEAD(&dev->txwi_cache);



	for (i = 0; i < ARRAY_SIZE(dev->q_rx); i++)

		skb_queue_head_init(&dev->rx_skb[i]);



	tasklet_init(&dev->tx_tasklet, mt76_tx_tasklet, (unsigned long)dev);



	return dev;
@@ -307,8 +313,6 @@ int mt76_register_device(struct mt76_dev *dev, bool vht, 


	dev_set_drvdata(dev->dev, dev);



	INIT_LIST_HEAD(&dev->txwi_cache);



	SET_IEEE80211_DEV(hw, dev->dev);

	SET_IEEE80211_PERM_ADDR(hw, dev->macaddr);

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

+0 −1
Original line number Diff line number Diff line
@@ -956,7 +956,6 @@ int mt76u_init(struct mt76_dev *dev, 
	tasklet_init(&usb->rx_tasklet, mt76u_rx_tasklet, (unsigned long)dev);

	tasklet_init(&dev->tx_tasklet, mt76u_tx_tasklet, (unsigned long)dev);

	INIT_WORK(&usb->stat_work, mt76u_tx_status_data);

	skb_queue_head_init(&dev->rx_skb[MT_RXQ_MAIN]);



	usb->stat_wq = alloc_workqueue("mt76u", WQ_UNBOUND, 0);

	if (!usb->stat_wq)