usb: gadget: net2280: let udc-core manage gadget->dev (654dfe4d) · Commits · 戴 / test

drivers/usb/gadget/net2280.c

+1 −4

Original line number	Diff line number	Diff line
		@@ -2679,7 +2679,6 @@ static void net2280_remove (struct pci_dev *pdev)
		pci_resource_len (pdev, 0));
		if (dev->enabled)
		pci_disable_device (pdev);
		device_unregister (&dev->gadget.dev);
		device_remove_file (&pdev->dev, &dev_attr_registers);
		pci_set_drvdata (pdev, NULL);

		@@ -2711,11 +2710,11 @@ static int net2280_probe (struct pci_dev pdev, const struct pci_device_id id)
		dev->gadget.max_speed = USB_SPEED_HIGH;

		/* the "gadget" abstracts/virtualizes the controller */
		dev_set_name(&dev->gadget.dev, "gadget");
		dev->gadget.dev.parent = &pdev->dev;
		dev->gadget.dev.dma_mask = pdev->dev.dma_mask;
		dev->gadget.dev.release = gadget_release;
		dev->gadget.name = driver_name;
		dev->gadget.register_my_device = true;

		/* now all the pci goodies ... */
		if (pci_enable_device (pdev) < 0) {
		@@ -2823,8 +2822,6 @@ static int net2280_probe (struct pci_dev pdev, const struct pci_device_id id)
		use_dma
		? (use_dma_chaining ? "chaining" : "enabled")
		: "disabled");
		retval = device_register (&dev->gadget.dev);
		if (retval) goto done;
		retval = device_create_file (&pdev->dev, &dev_attr_registers);
		if (retval) goto done;