mt76x0: remove some usb specific code from mt76x0_register_device (6d1bced1) · Commits · 戴 / test

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

+0 −8

Original line number	Diff line number	Diff line
		@@ -518,14 +518,6 @@ int mt76x0_register_device(struct mt76x0_dev *dev)
		struct wiphy *wiphy = hw->wiphy;
		int ret;

		ret = mt76u_mcu_init_rx(mdev);
		if (ret < 0)
		return ret;

		ret = mt76u_alloc_queues(mdev);
		if (ret < 0)
		return ret;

		ret = mt76x0_init_hardware(dev);
		if (ret)
		return ret;

+10 −2

Original line number	Diff line number	Diff line
		@@ -46,7 +46,7 @@ static struct usb_device_id mt76x0_device_table[] = {
		{ 0, }
		};

		static int mt76x0_probe(struct usb_interface *usb_intf,
		static int mt76x0u_probe(struct usb_interface *usb_intf,
		const struct usb_device_id *id)
		{
		struct usb_device *usb_dev = interface_to_usbdev(usb_intf);
		@@ -84,6 +84,14 @@ static int mt76x0_probe(struct usb_interface *usb_intf,
		if (!(mt76_rr(dev, MT_EFUSE_CTRL) & MT_EFUSE_CTRL_SEL))
		dev_warn(dev->mt76.dev, "Warning: eFUSE not present\n");

		ret = mt76u_mcu_init_rx(&dev->mt76);
		if (ret < 0)
		goto err;

		ret = mt76u_alloc_queues(&dev->mt76);
		if (ret < 0)
		goto err;

		ret = mt76x0_register_device(dev);
		if (ret)
		goto err_hw;
		@@ -170,7 +178,7 @@ MODULE_LICENSE("GPL");
		static struct usb_driver mt76x0_driver = {
		.name = KBUILD_MODNAME,
		.id_table = mt76x0_device_table,
		.probe = mt76x0_probe,
		.probe = mt76x0u_probe,
		.disconnect = mt76x0_disconnect,
		.suspend = mt76x0_suspend,
		.resume = mt76x0_resume,