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

Commit fc994dbb authored by Stanislaw Gruszka's avatar Stanislaw Gruszka Committed by Felix Fietkau
Browse files

mt76usb: remove usb_mcu.c 



Don't need separate file just for kmalloc/kfree.

Signed-off-by: default avatarStanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent a18a494f

drivers/net/wireless/mediatek/mt76/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ mt76-y := \ 
	mmio.o util.o trace.o dma.o mac80211.o debugfs.o eeprom.o \

	tx.o agg-rx.o mcu.o



mt76-usb-y := usb.o usb_trace.o usb_mcu.o

mt76-usb-y := usb.o usb_trace.o



CFLAGS_trace.o := -I$(src)

CFLAGS_usb_trace.o := -I$(src)

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

+0 −2
Original line number Diff line number Diff line
@@ -771,7 +771,5 @@ struct sk_buff *mt76_mcu_get_response(struct mt76_dev *dev, 
				      unsigned long expires);



void mt76u_mcu_complete_urb(struct urb *urb);

int mt76u_mcu_init_rx(struct mt76_dev *dev);

void mt76u_mcu_deinit(struct mt76_dev *dev);



#endif

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

+0 −5
Original line number Diff line number Diff line
@@ -79,7 +79,6 @@ static void mt76x0u_cleanup(struct mt76x02_dev *dev) 
	clear_bit(MT76_STATE_INITIALIZED, &dev->mt76.state);

	mt76x0_chip_onoff(dev, false, false);

	mt76u_queues_deinit(&dev->mt76);

	mt76u_mcu_deinit(&dev->mt76);

}



static void mt76x0u_mac_stop(struct mt76x02_dev *dev)
@@ -193,10 +192,6 @@ static int mt76x0u_register_device(struct mt76x02_dev *dev) 
	if (err < 0)

		goto out_err;



	err = mt76u_mcu_init_rx(&dev->mt76);

	if (err < 0)

		goto out_err;



	err = mt76x0u_init_hardware(dev);

	if (err < 0)

		goto out_err;

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

+0 −5
Original line number Diff line number Diff line
@@ -214,10 +214,6 @@ int mt76x2u_register_device(struct mt76x02_dev *dev) 
	if (err < 0)

		goto fail;



	err = mt76u_mcu_init_rx(&dev->mt76);

	if (err < 0)

		goto fail;



	err = mt76x2u_init_hardware(dev);

	if (err < 0)

		goto fail;
@@ -259,5 +255,4 @@ void mt76x2u_cleanup(struct mt76x02_dev *dev) 
	mt76x02_mcu_set_radio_state(dev, false);

	mt76x2u_stop_hw(dev);

	mt76u_queues_deinit(&dev->mt76);

	mt76u_mcu_deinit(&dev->mt76);

}

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

+5 −0
Original line number Diff line number Diff line
@@ -577,9 +577,14 @@ EXPORT_SYMBOL_GPL(mt76u_submit_rx_buffers); 


static int mt76u_alloc_rx(struct mt76_dev *dev)

{

	struct mt76_usb *usb = &dev->usb;

	struct mt76_queue *q = &dev->q_rx[MT_RXQ_MAIN];

	int i, err;



	usb->mcu.data = devm_kmalloc(dev->dev, MCU_RESP_URB_SIZE, GFP_KERNEL);

	if (!usb->mcu.data)

		return -ENOMEM;



	spin_lock_init(&q->rx_page_lock);

	spin_lock_init(&q->lock);

	q->entry = devm_kcalloc(dev->dev,