kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Driver core: Remove unneeded get_{device,driver}() calls.

Browse source 
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:
Cornelia Huck 2008-01-31 10:39:38 +01:00 committed by Greg Kroah-Hartman
parent 44414e14af
commit 0c98b19fe5
2 changed files with 5 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/base/core.c
View file

@ -423,10 +423,8 @@ struct kset *devices_kset;
int device_create_file(struct device *dev, struct device_attribute *attr) int device_create_file(struct device *dev, struct device_attribute *attr)
{ {
int error = 0; int error = 0;
if (get_device(dev)) { if (dev)
error = sysfs_create_file(&dev->kobj, &attr->attr); error = sysfs_create_file(&dev->kobj, &attr->attr);
put_device(dev);
}
return error; 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) void device_remove_file(struct device *dev, struct device_attribute *attr)
{ {
if (get_device(dev)) { if (dev)
sysfs_remove_file(&dev->kobj, &attr->attr); sysfs_remove_file(&dev->kobj, &attr->attr);
put_device(dev);
}
} }
/** /**

9
drivers/base/driver.c
View file

@ -97,10 +97,9 @@ int driver_create_file(struct device_driver *drv,
struct driver_attribute *attr) struct driver_attribute *attr)
{ {
int error; int error;
if (get_driver(drv)) { if (drv)
error = sysfs_create_file(&drv->p->kobj, &attr->attr); error = sysfs_create_file(&drv->p->kobj, &attr->attr);
put_driver(drv); else
} else
error = -EINVAL; error = -EINVAL;
return error; return error;
} }
@ -114,10 +113,8 @@ EXPORT_SYMBOL_GPL(driver_create_file);
void driver_remove_file(struct device_driver *drv, void driver_remove_file(struct device_driver *drv,
struct driver_attribute *attr) struct driver_attribute *attr)
{ {
if (get_driver(drv)) { if (drv)
sysfs_remove_file(&drv->p->kobj, &attr->attr); sysfs_remove_file(&drv->p->kobj, &attr->attr);
put_driver(drv);
}
} }
EXPORT_SYMBOL_GPL(driver_remove_file); EXPORT_SYMBOL_GPL(driver_remove_file);