aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorMariusz Kozlowski <m.kozlowski@tuxland.pl>2007-01-02 13:41:10 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2007-02-07 10:37:13 -0800
commitf75065367077bd3b77842a5aa523ecd05d33e82d (patch)
tree8c88382e578c2df7ff14ec005ae821dd4b36379e /fs
parentd3fc373ac5061cab7a654502b942e7d00e77f733 (diff)
sysfs: kobject_put cleanup
This patch removes redundant argument checks for kobject_put(). Signed-off-by: Mariusz Kozlowski <m.kozlowski@tuxland.pl> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'fs')
-rw-r--r--fs/sysfs/bin.c5
-rw-r--r--fs/sysfs/file.c5
2 files changed, 4 insertions, 6 deletions
diff --git a/fs/sysfs/bin.c b/fs/sysfs/bin.c
index 9ec1c8539a5d..d3b9f5f07db1 100644
--- a/fs/sysfs/bin.c
+++ b/fs/sysfs/bin.c
@@ -147,7 +147,7 @@ static int open(struct inode * inode, struct file * file)
Error:
module_put(attr->attr.owner);
Done:
- if (error && kobj)
+ if (error)
kobject_put(kobj);
return error;
}
@@ -158,8 +158,7 @@ static int release(struct inode * inode, struct file * file)
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 --git a/fs/sysfs/file.c b/fs/sysfs/file.c
index cba4c1c7383c..46618f81ae48 100644
--- a/fs/sysfs/file.c
+++ b/fs/sysfs/file.c
@@ -361,7 +361,7 @@ static int sysfs_open_file(struct inode *inode, struct file *file)
error = -EACCES;
module_put(attr->owner);
Done:
- if (error && kobj)
+ if (error)
kobject_put(kobj);
return error;
}
@@ -375,8 +375,7 @@ static int sysfs_release(struct inode * inode, struct file * filp)
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);

Privacy Policy