Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9ee4685c authored by Jani Nikula's avatar Jani Nikula
Browse files

sysfs: constify sysfs create/remove files harder 



Let the passed in array be const (and thus placed in rodata) instead of
a mutable array of const pointers.

Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: "Rafael J. Wysocki" <rafael@kernel.org>
Reviewed-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20181004143750.30880-1-jani.nikula@intel.com
parent 46592892

fs/sysfs/file.c

+2 −2
Original line number Diff line number Diff line
@@ -334,7 +334,7 @@ int sysfs_create_file_ns(struct kobject *kobj, const struct attribute *attr, 
}

EXPORT_SYMBOL_GPL(sysfs_create_file_ns);



int sysfs_create_files(struct kobject *kobj, const struct attribute **ptr)

int sysfs_create_files(struct kobject *kobj, const struct attribute * const *ptr)

{

	int err = 0;

	int i;
@@ -493,7 +493,7 @@ bool sysfs_remove_file_self(struct kobject *kobj, const struct attribute *attr) 
	return ret;

}



void sysfs_remove_files(struct kobject *kobj, const struct attribute **ptr)

void sysfs_remove_files(struct kobject *kobj, const struct attribute * const *ptr)

{

	int i;

	for (i = 0; ptr[i]; i++)

include/linux/sysfs.h

+4 −4
Original line number Diff line number Diff line
@@ -234,7 +234,7 @@ int __must_check sysfs_create_file_ns(struct kobject *kobj, 
				      const struct attribute *attr,

				      const void *ns);

int __must_check sysfs_create_files(struct kobject *kobj,

				   const struct attribute **attr);

				   const struct attribute * const *attr);

int __must_check sysfs_chmod_file(struct kobject *kobj,

				  const struct attribute *attr, umode_t mode);

struct kernfs_node *sysfs_break_active_protection(struct kobject *kobj,
@@ -243,7 +243,7 @@ void sysfs_unbreak_active_protection(struct kernfs_node *kn); 
void sysfs_remove_file_ns(struct kobject *kobj, const struct attribute *attr,

			  const void *ns);

bool sysfs_remove_file_self(struct kobject *kobj, const struct attribute *attr);

void sysfs_remove_files(struct kobject *kobj, const struct attribute **attr);

void sysfs_remove_files(struct kobject *kobj, const struct attribute * const *attr);



int __must_check sysfs_create_bin_file(struct kobject *kobj,

				       const struct bin_attribute *attr);
@@ -342,7 +342,7 @@ static inline int sysfs_create_file_ns(struct kobject *kobj, 
}



static inline int sysfs_create_files(struct kobject *kobj,

				    const struct attribute **attr)

				    const struct attribute * const *attr)

{

	return 0;

}
@@ -377,7 +377,7 @@ static inline bool sysfs_remove_file_self(struct kobject *kobj, 
}



static inline void sysfs_remove_files(struct kobject *kobj,

				     const struct attribute **attr)

				     const struct attribute * const *attr)

{

}