From 41b8a2631639adcafa6027ebf8bb7c7883f13732 Mon Sep 17 00:00:00 2001
From: Cornelia Huck <cornelia.huck@de.ibm.com>
Date: Thu, 31 Jan 2008 10:39:38 +0100
Subject: [PATCH] --- yaml --- r: 82629 b: refs/heads/master c:
 0c98b19fe571ede1f14bd95b855bcbe2cca99bcf h: refs/heads/master i:   82627:
 913fdcdc353f58470723fd56dd09f32a0ea14620 v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/base/core.c   | 8 ++------
 trunk/drivers/base/driver.c | 9 +++------
 3 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index a02dc8958657..cf17e9f2c450 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 44414e14af3f18fc8c1b94e259cd760366f665ee
+refs/heads/master: 0c98b19fe571ede1f14bd95b855bcbe2cca99bcf
diff --git a/trunk/drivers/base/core.c b/trunk/drivers/base/core.c
index a0cfda553c9d..9c0070b5bd3e 100644
--- a/trunk/drivers/base/core.c
+++ b/trunk/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/trunk/drivers/base/driver.c b/trunk/drivers/base/driver.c
index a35f04121a00..ba75184c653c 100644
--- a/trunk/drivers/base/driver.c
+++ b/trunk/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);