Skip to content

Commit

Permalink
sysfs: small header file cleanup for SYSFS=n
Browse files Browse the repository at this point in the history
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 <[email protected]>
Reviewed-by: Randy Dunlap <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
  • Loading branch information
rientjes authored and gregkh committed Apr 20, 2008
1 parent 1429db8 commit 3612e06
Showing 1 changed file with 2 additions and 7 deletions.
9 changes: 2 additions & 7 deletions include/linux/sysfs.h
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,6 @@ static inline int sysfs_create_dir(struct kobject *kobj)

static inline void sysfs_remove_dir(struct kobject *kobj)
{
;
}

static inline int sysfs_rename_dir(struct kobject *kobj, const char *new_name)
Expand Down Expand Up @@ -160,7 +159,6 @@ static inline int sysfs_chmod_file(struct kobject *kobj,
static inline void sysfs_remove_file(struct kobject *kobj,
const struct attribute *attr)
{
;
}

static inline int sysfs_create_bin_file(struct kobject *kobj,
Expand All @@ -169,10 +167,9 @@ static inline int sysfs_create_bin_file(struct kobject *kobj,
return 0;
}

static inline int sysfs_remove_bin_file(struct kobject *kobj,
struct bin_attribute *attr)
static inline void sysfs_remove_bin_file(struct kobject *kobj,
struct bin_attribute *attr)
{
return 0;
}

static inline int sysfs_create_link(struct kobject *kobj,
Expand All @@ -183,7 +180,6 @@ static inline int sysfs_create_link(struct kobject *kobj,

static inline void sysfs_remove_link(struct kobject *kobj, const char *name)
{
;
}

static inline int sysfs_create_group(struct kobject *kobj,
Expand All @@ -195,7 +191,6 @@ static inline int sysfs_create_group(struct kobject *kobj,
static inline void sysfs_remove_group(struct kobject *kobj,
const struct attribute_group *grp)
{
;
}

static inline int sysfs_add_file_to_group(struct kobject *kobj,
Expand Down

0 comments on commit 3612e06

Please sign in to comment.