mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-31 12:10:52 -04:00
USB/PCI/PCMCIA: Clean up new_id and remove_id sysfs attribute routines
This patch (as1514) cleans up some places where new_id and remove_id sysfs attributes are created and deleted. Handling both attributes in a single routine rather than a pair of routines makes the code smaller. It also prevents certain kinds of errors, like one we currently have in the USB subsystem: The removeid attribute is often created even when newid isn't (because the driver's no_dynamid_id flag is set). In the case of the PCMCIA subsystem, the newid attribute is created but never explicitly deleted. The patch adds a deletion routine. Signed-off-by: Alan Stern <[email protected]> Acked-by: Jesse Barnes <[email protected]> Acked-by: Dominik Brodowski <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
This commit is contained in:
parent
fad12ac8c8
commit
ed283e9f0a
3 changed files with 43 additions and 74 deletions
|
|
@ -157,6 +157,11 @@ pcmcia_create_newid_file(struct pcmcia_driver *drv)
|
|||
return error;
|
||||
}
|
||||
|
||||
static void
|
||||
pcmcia_remove_newid_file(struct pcmcia_driver *drv)
|
||||
{
|
||||
driver_remove_file(&drv->drv, &driver_attr_new_id);
|
||||
}
|
||||
|
||||
/**
|
||||
* pcmcia_register_driver - register a PCMCIA driver with the bus core
|
||||
|
|
@ -201,6 +206,7 @@ EXPORT_SYMBOL(pcmcia_register_driver);
|
|||
void pcmcia_unregister_driver(struct pcmcia_driver *driver)
|
||||
{
|
||||
pr_debug("unregistering driver %s\n", driver->name);
|
||||
pcmcia_remove_newid_file(driver);
|
||||
driver_unregister(&driver->drv);
|
||||
pcmcia_free_dynids(driver);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue