The patch titled
sysfs: small header file cleanup
has been removed from the -mm tree. Its filename was
sysfs-small-header-file-cleanup.patch
This patch was dropped because it was merged into mainline or a subsystem tree
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: sysfs: small header file cleanup
From: David Rientjes <rientjes@xxxxxxxxxx>
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@xxxxxxxxxx>
Reviewed-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
Cc: Greg KH <greg@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/sysfs.h | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff -puN include/linux/sysfs.h~sysfs-small-header-file-cleanup include/linux/sysfs.h
--- a/include/linux/sysfs.h~sysfs-small-header-file-cleanup
+++ a/include/linux/sysfs.h
@@ -132,7 +132,6 @@ static inline int sysfs_create_dir(struc
static inline void sysfs_remove_dir(struct kobject *kobj)
{
- ;
}
static inline int sysfs_rename_dir(struct kobject *kobj, const char *new_name)
@@ -161,7 +160,6 @@ static inline int sysfs_chmod_file(struc
static inline void sysfs_remove_file(struct kobject *kobj,
const struct attribute *attr)
{
- ;
}
static inline int sysfs_create_bin_file(struct kobject *kobj,
@@ -170,10 +168,9 @@ static inline int sysfs_create_bin_file(
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,
@@ -184,7 +181,6 @@ static inline int sysfs_create_link(stru
static inline void sysfs_remove_link(struct kobject *kobj, const char *name)
{
- ;
}
static inline int sysfs_create_group(struct kobject *kobj,
@@ -196,7 +192,6 @@ static inline int sysfs_create_group(str
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,
_
Patches currently in -mm which might be from rientjes@xxxxxxxxxx are
sparc-fix-build.patch
make-cgroup_enable_task_cg_lists-static.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
