Driver core: Remove unneeded get_{device,driver}() calls.
Driver core: Remove unneeded get_{device,driver}() calls. Code trying to add/remove attributes must hold a reference to the device resp. driver anyway, so let's remove those reference count games. Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com> Cc: Dave Young <hidave.darkstar@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
44414e14af
commit
0c98b19fe5
2 changed files with 5 additions and 12 deletions
|
@ -423,10 +423,8 @@ struct kset *devices_kset;
|
|||
int device_create_file(struct device *dev, struct device_attribute *attr)
|
||||
{
|
||||
int error = 0;
|
||||
if (get_device(dev)) {
|
||||
if (dev)
|
||||
error = sysfs_create_file(&dev->kobj, &attr->attr);
|
||||
put_device(dev);
|
||||
}
|
||||
return error;
|
||||
}
|
||||
|
||||
|
@ -437,10 +435,8 @@ int device_create_file(struct device *dev, struct device_attribute *attr)
|
|||
*/
|
||||
void device_remove_file(struct device *dev, struct device_attribute *attr)
|
||||
{
|
||||
if (get_device(dev)) {
|
||||
if (dev)
|
||||
sysfs_remove_file(&dev->kobj, &attr->attr);
|
||||
put_device(dev);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -97,10 +97,9 @@ int driver_create_file(struct device_driver *drv,
|
|||
struct driver_attribute *attr)
|
||||
{
|
||||
int error;
|
||||
if (get_driver(drv)) {
|
||||
if (drv)
|
||||
error = sysfs_create_file(&drv->p->kobj, &attr->attr);
|
||||
put_driver(drv);
|
||||
} else
|
||||
else
|
||||
error = -EINVAL;
|
||||
return error;
|
||||
}
|
||||
|
@ -114,10 +113,8 @@ EXPORT_SYMBOL_GPL(driver_create_file);
|
|||
void driver_remove_file(struct device_driver *drv,
|
||||
struct driver_attribute *attr)
|
||||
{
|
||||
if (get_driver(drv)) {
|
||||
if (drv)
|
||||
sysfs_remove_file(&drv->p->kobj, &attr->attr);
|
||||
put_driver(drv);
|
||||
}
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(driver_remove_file);
|
||||
|
||||
|
|
Loading…
Reference in a new issue