Dynamic ID addition doesn't need get_driver() (cef9bc56) · Commits · 戴 / test

As part of the removal of get_driver()/put_driver(), this patch (as1511) changes all the places that add dynamic IDs for drivers. Since these additions are done by writing to the drivers' sysfs attribute files, and the attributes are removed when the drivers are unregistered, there is no reason to take an extra reference to the drivers. The one exception is the pci-stub driver, which calls pci_add_dynid() as part of its registration. But again, there's no reason to take an extra reference here, because the driver can't be unloaded while it is being registered. Signed-off-by:

Alan Stern <stern@rowland.harvard.edu> CC: Dmitry Torokhov <dmitry.torokhov@gmail.com> CC: Jiri Kosina <jkosina@suse.cz> CC: Jesse Barnes <jbarnes@virtuousgeek.org> CC: Dominik Brodowski <linux@dominikbrodowski.net> Signed-off-by:

Greg Kroah-Hartman <gregkh@suse.de>

drivers/hid/hid-core.c

+1 −5

Original line number	Diff line number	Diff line
		@@ -1619,11 +1619,7 @@ static ssize_t store_new_id(struct device_driver drv, const char buf,
		list_add_tail(&dynid->list, &hdrv->dyn_list);
		spin_unlock(&hdrv->dyn_lock);

		ret = 0;
		if (get_driver(&hdrv->driver)) {
		ret = driver_attach(&hdrv->driver);
		put_driver(&hdrv->driver);
		}

		return ret ? : count;
		}

drivers/pci/pci-driver.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -72,9 +72,7 @@ int pci_add_dynid(struct pci_driver *drv,
		list_add_tail(&dynid->node, &drv->dynids.list);
		spin_unlock(&drv->dynids.lock);

		get_driver(&drv->driver);
		retval = driver_attach(&drv->driver);
		put_driver(&drv->driver);

		return retval;
		}

drivers/pcmcia/ds.c

+1 −4

Original line number	Diff line number	Diff line
		@@ -127,10 +127,7 @@ pcmcia_store_new_id(struct device_driver driver, const char buf, size_t count)
		list_add_tail(&dynid->node, &pdrv->dynids.list);
		mutex_unlock(&pdrv->dynids.lock);

		if (get_driver(&pdrv->drv)) {
		retval = driver_attach(&pdrv->drv);
		put_driver(&pdrv->drv);
		}

		if (retval)
		return retval;

drivers/usb/core/driver.c

+1 −4

Original line number	Diff line number	Diff line
		@@ -71,10 +71,7 @@ ssize_t usb_store_new_id(struct usb_dynids *dynids,
		list_add_tail(&dynid->node, &dynids->list);
		spin_unlock(&dynids->lock);

		if (get_driver(driver)) {
		retval = driver_attach(driver);
		put_driver(driver);
		}

		if (retval)
		return retval;

Admin message