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>

2 files changed, 5 insertions, 12 deletions

diff --git a/drivers/base/core.c b/drivers/base/core.c
index a0cfda553c9d..9c0070b5bd3e 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -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);
-        }
 }
 
 /**
diff --git a/drivers/base/driver.c b/drivers/base/driver.c
index a35f04121a00..ba75184c653c 100644
--- a/drivers/base/driver.c
+++ b/drivers/base/driver.c
@@ -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);