[patch] fs: sysfs kobject_put cleanup

[Mariusz Kozlowski]

Hello,

	This patch removes redundant argument checks for kobject_put().

Signed-off-by: Mariusz Kozlowski <m.kozlowski@xxxxxxxxxx>

 fs/sysfs/bin.c  |    5 ++---
 fs/sysfs/file.c |    5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff -upr linux-2.6.20-rc2-mm1-a/fs/sysfs/bin.c linux-2.6.20-rc2-mm1-b/fs/sysfs/bin.c
--- linux-2.6.20-rc2-mm1-a/fs/sysfs/bin.c	2006-12-24 05:00:32.000000000 +0100
+++ linux-2.6.20-rc2-mm1-b/fs/sysfs/bin.c	2007-01-02 02:34:32.000000000 +0100
@@ -146,7 +146,7 @@ static int open(struct inode * inode, st
  Error:
 	module_put(attr->attr.owner);
  Done:
-	if (error && kobj)
+	if (error)
 		kobject_put(kobj);
 	return error;
 }
@@ -157,8 +157,7 @@ static int release(struct inode * inode,
 	struct bin_attribute * attr = to_bin_attr(file->f_path.dentry);
 	u8 * buffer = file->private_data;
 
-	if (kobj) 
-		kobject_put(kobj);
+	kobject_put(kobj);
 	module_put(attr->attr.owner);
 	kfree(buffer);
 	return 0;
diff -upr linux-2.6.20-rc2-mm1-a/fs/sysfs/file.c linux-2.6.20-rc2-mm1-b/fs/sysfs/file.c
--- linux-2.6.20-rc2-mm1-a/fs/sysfs/file.c	2006-12-28 12:57:48.000000000 +0100
+++ linux-2.6.20-rc2-mm1-b/fs/sysfs/file.c	2007-01-02 02:34:03.000000000 +0100
@@ -375,7 +375,7 @@ static int sysfs_open_file(struct inode 
 	error = -EACCES;
 	module_put(attr->owner);
  Done:
-	if (error && kobj)
+	if (error)
 		kobject_put(kobj);
 	return error;
 }
@@ -389,8 +389,7 @@ static int sysfs_release(struct inode * 
 
 	if (buffer)
 		remove_from_collection(buffer, inode);
-	if (kobj) 
-		kobject_put(kobj);
+	kobject_put(kobj);
 	/* After this point, attr should not be accessed. */
 	module_put(owner);
 


-- 
Regards,

	Mariusz Kozlowski
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/