diff options
author | David Rientjes <rientjes@google.com> | 2008-02-19 20:39:02 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-04-19 22:10:20 -0400 |
commit | 3612e06b2c1cec41e9a59da3eec673a206af4643 (patch) | |
tree | b98aa96f89c0021177f324459dfebdc4372eb0df | |
parent | 1429db83e276c2a16c7ea83bdcf0dcd3a36e406d (diff) |
sysfs: small header file cleanup for SYSFS=n
Convert sysfs_remove_bin_file() to have a return type of 'void' for
!CONFIG_SYSFS configurations. Also removes unnecessary colons from empty
void functions.
Signed-off-by: David Rientjes <rientjes@google.com>
Reviewed-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | include/linux/sysfs.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/include/linux/sysfs.h b/include/linux/sysfs.h index 802710438a9e..03378e3515b3 100644 --- a/include/linux/sysfs.h +++ b/include/linux/sysfs.h | |||
@@ -131,7 +131,6 @@ static inline int sysfs_create_dir(struct kobject *kobj) | |||
131 | 131 | ||
132 | static inline void sysfs_remove_dir(struct kobject *kobj) | 132 | static inline void sysfs_remove_dir(struct kobject *kobj) |
133 | { | 133 | { |
134 | ; | ||
135 | } | 134 | } |
136 | 135 | ||
137 | static inline int sysfs_rename_dir(struct kobject *kobj, const char *new_name) | 136 | static inline int sysfs_rename_dir(struct kobject *kobj, const char *new_name) |
@@ -160,7 +159,6 @@ static inline int sysfs_chmod_file(struct kobject *kobj, | |||
160 | static inline void sysfs_remove_file(struct kobject *kobj, | 159 | static inline void sysfs_remove_file(struct kobject *kobj, |
161 | const struct attribute *attr) | 160 | const struct attribute *attr) |
162 | { | 161 | { |
163 | ; | ||
164 | } | 162 | } |
165 | 163 | ||
166 | static inline int sysfs_create_bin_file(struct kobject *kobj, | 164 | static inline int sysfs_create_bin_file(struct kobject *kobj, |
@@ -169,10 +167,9 @@ static inline int sysfs_create_bin_file(struct kobject *kobj, | |||
169 | return 0; | 167 | return 0; |
170 | } | 168 | } |
171 | 169 | ||
172 | static inline int sysfs_remove_bin_file(struct kobject *kobj, | 170 | static inline void sysfs_remove_bin_file(struct kobject *kobj, |
173 | struct bin_attribute *attr) | 171 | struct bin_attribute *attr) |
174 | { | 172 | { |
175 | return 0; | ||
176 | } | 173 | } |
177 | 174 | ||
178 | static inline int sysfs_create_link(struct kobject *kobj, | 175 | static inline int sysfs_create_link(struct kobject *kobj, |
@@ -183,7 +180,6 @@ static inline int sysfs_create_link(struct kobject *kobj, | |||
183 | 180 | ||
184 | static inline void sysfs_remove_link(struct kobject *kobj, const char *name) | 181 | static inline void sysfs_remove_link(struct kobject *kobj, const char *name) |
185 | { | 182 | { |
186 | ; | ||
187 | } | 183 | } |
188 | 184 | ||
189 | static inline int sysfs_create_group(struct kobject *kobj, | 185 | static inline int sysfs_create_group(struct kobject *kobj, |
@@ -195,7 +191,6 @@ static inline int sysfs_create_group(struct kobject *kobj, | |||
195 | static inline void sysfs_remove_group(struct kobject *kobj, | 191 | static inline void sysfs_remove_group(struct kobject *kobj, |
196 | const struct attribute_group *grp) | 192 | const struct attribute_group *grp) |
197 | { | 193 | { |
198 | ; | ||
199 | } | 194 | } |
200 | 195 | ||
201 | static inline int sysfs_add_file_to_group(struct kobject *kobj, | 196 | static inline int sysfs_add_file_to_group(struct kobject *kobj, |