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

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

mt76x2u: remove mt76x2u_alloc_device routine 



Remove mt76x2u_alloc_device since it just runs mt76_alloc_device.
Move mt76_alloc_device call in mt76x2u_probe

Signed-off-by: default avatarLorenzo Bianconi <lorenzo.bianconi@redhat.com>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent c0f7b25a

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

+0 −1
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ 


extern const struct ieee80211_ops mt76x2u_ops;



struct mt76x02_dev *mt76x2u_alloc_device(struct device *pdev);

int mt76x2u_register_device(struct mt76x02_dev *dev);

int mt76x2u_init_hardware(struct mt76x02_dev *dev);

void mt76x2u_cleanup(struct mt76x02_dev *dev);

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

+18 −6
Original line number Diff line number Diff line
@@ -36,24 +36,36 @@ static const struct usb_device_id mt76x2u_device_table[] = { 
static int mt76x2u_probe(struct usb_interface *intf,

			 const struct usb_device_id *id)

{

	static const struct mt76_driver_ops drv_ops = {

		.tx_prepare_skb = mt76x02u_tx_prepare_skb,

		.tx_complete_skb = mt76x02u_tx_complete_skb,

		.tx_status_data = mt76x02_tx_status_data,

		.rx_skb = mt76x02_queue_rx_skb,

		.sta_add = mt76x02_sta_add,

		.sta_remove = mt76x02_sta_remove,

	};

	struct usb_device *udev = interface_to_usbdev(intf);

	struct mt76x02_dev *dev;

	struct mt76_dev *mdev;

	int err;



	dev = mt76x2u_alloc_device(&intf->dev);

	if (!dev)

	mdev = mt76_alloc_device(&intf->dev, sizeof(*dev), &mt76x2u_ops,

				 &drv_ops);

	if (!mdev)

		return -ENOMEM;



	dev = container_of(mdev, struct mt76x02_dev, mt76);



	udev = usb_get_dev(udev);

	usb_reset_device(udev);



	mt76x02u_init_mcu(&dev->mt76);

	err = mt76u_init(&dev->mt76, intf);

	mt76x02u_init_mcu(mdev);

	err = mt76u_init(mdev, intf);

	if (err < 0)

		goto err;



	dev->mt76.rev = mt76_rr(dev, MT_ASIC_VERSION);

	dev_info(dev->mt76.dev, "ASIC revision: %08x\n", dev->mt76.rev);

	mdev->rev = mt76_rr(dev, MT_ASIC_VERSION);

	dev_info(mdev->dev, "ASIC revision: %08x\n", mdev->rev);



	err = mt76x2u_register_device(dev);

	if (err < 0)

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

+0 −23
Original line number Diff line number Diff line
@@ -134,29 +134,6 @@ static int mt76x2u_init_eeprom(struct mt76x02_dev *dev) 
	return 0;

}



struct mt76x02_dev *mt76x2u_alloc_device(struct device *pdev)

{

	static const struct mt76_driver_ops drv_ops = {

		.tx_prepare_skb = mt76x02u_tx_prepare_skb,

		.tx_complete_skb = mt76x02u_tx_complete_skb,

		.tx_status_data = mt76x02_tx_status_data,

		.rx_skb = mt76x02_queue_rx_skb,

		.sta_add = mt76x02_sta_add,

		.sta_remove = mt76x02_sta_remove,

	};

	struct mt76x02_dev *dev;

	struct mt76_dev *mdev;



	mdev = mt76_alloc_device(pdev, sizeof(*dev), &mt76x2u_ops,

				 &drv_ops);

	if (!mdev)

		return NULL;



	dev = container_of(mdev, struct mt76x02_dev, mt76);



	return dev;

}



int mt76x2u_init_hardware(struct mt76x02_dev *dev)

{

	int i, k, err;