sysfs: constify group arrays in function arguments

Constify the groups array argument where applicable. This allows to
pass constant arrays as arguments.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Link: https://patch.msgid.link/17035265-8882-4101-b7a7-16b3eb94f8b5@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/fs/sysfs/group.c b/fs/sysfs/group.c
index e1e639f515a0fd4b013f2e25de8bd21557f174c2..b3edae0578c0730ffd02bf02bae514c4446f16c0 100644 (file)
--- a/fs/sysfs/group.c
+++ b/fs/sysfs/group.c
@@ -217,7 +217,7 @@ int sysfs_create_group(struct kobject *kobj,
 EXPORT_SYMBOL_GPL(sysfs_create_group);
 
 static int internal_create_groups(struct kobject *kobj, int update,
-                                 const struct attribute_group **groups)
+                                 const struct attribute_group *const *groups)
 {
        int error = 0;
        int i;
@@ -250,7 +250,7 @@ static int internal_create_groups(struct kobject *kobj, int update,
  * Returns 0 on success or error code from sysfs_create_group on failure.
  */
 int sysfs_create_groups(struct kobject *kobj,
-                       const struct attribute_group **groups)
+                       const struct attribute_group *const *groups)
 {
        return internal_create_groups(kobj, 0, groups);
 }
@@ -268,7 +268,7 @@ EXPORT_SYMBOL_GPL(sysfs_create_groups);
  * Returns 0 on success or error code from sysfs_update_group on failure.
  */
 int sysfs_update_groups(struct kobject *kobj,
-                       const struct attribute_group **groups)
+                       const struct attribute_group *const *groups)
 {
        return internal_create_groups(kobj, 1, groups);
 }
@@ -342,7 +342,7 @@ EXPORT_SYMBOL_GPL(sysfs_remove_group);
  * If groups is not NULL, remove the specified groups from the kobject.
  */
 void sysfs_remove_groups(struct kobject *kobj,
-                        const struct attribute_group **groups)
+                        const struct attribute_group *const *groups)
 {
        int i;
 
@@ -613,7 +613,7 @@ EXPORT_SYMBOL_GPL(sysfs_group_change_owner);
  * Returns 0 on success or error code on failure.
  */
 int sysfs_groups_change_owner(struct kobject *kobj,
-                             const struct attribute_group **groups,
+                             const struct attribute_group *const *groups,
                              kuid_t kuid, kgid_t kgid)
 {
        int error = 0, i;

diff --git a/include/linux/sysfs.h b/include/linux/sysfs.h
index 99b775f3ff469f0ffb56b03f2e20ecde095eafc2..9777e9445dd51bfc91f37500835500a7734d7696 100644 (file)
--- a/include/linux/sysfs.h
+++ b/include/linux/sysfs.h
@@ -445,15 +445,15 @@ void sysfs_delete_link(struct kobject *dir, struct kobject *targ,
 int __must_check sysfs_create_group(struct kobject *kobj,
                                    const struct attribute_group *grp);
 int __must_check sysfs_create_groups(struct kobject *kobj,
-                                    const struct attribute_group **groups);
+                                    const struct attribute_group *const *groups);
 int __must_check sysfs_update_groups(struct kobject *kobj,
-                                    const struct attribute_group **groups);
+                                    const struct attribute_group *const *groups);
 int sysfs_update_group(struct kobject *kobj,
                       const struct attribute_group *grp);
 void sysfs_remove_group(struct kobject *kobj,
                        const struct attribute_group *grp);
 void sysfs_remove_groups(struct kobject *kobj,
-                        const struct attribute_group **groups);
+                        const struct attribute_group *const *groups);
 int sysfs_add_file_to_group(struct kobject *kobj,
                        const struct attribute *attr, const char *group);
 void sysfs_remove_file_from_group(struct kobject *kobj,
@@ -486,7 +486,7 @@ int sysfs_change_owner(struct kobject *kobj, kuid_t kuid, kgid_t kgid);
 int sysfs_link_change_owner(struct kobject *kobj, struct kobject *targ,
                            const char *name, kuid_t kuid, kgid_t kgid);
 int sysfs_groups_change_owner(struct kobject *kobj,
-                             const struct attribute_group **groups,
+                             const struct attribute_group *const *groups,
                              kuid_t kuid, kgid_t kgid);
 int sysfs_group_change_owner(struct kobject *kobj,
                             const struct attribute_group *groups, kuid_t kuid,
@@ -629,13 +629,13 @@ static inline int sysfs_create_group(struct kobject *kobj,
 }
 
 static inline int sysfs_create_groups(struct kobject *kobj,
-                                     const struct attribute_group **groups)
+                                     const struct attribute_group *const *groups)
 {
        return 0;
 }
 
 static inline int sysfs_update_groups(struct kobject *kobj,
-                                     const struct attribute_group **groups)
+                                     const struct attribute_group *const *groups)
 {
        return 0;
 }
@@ -652,7 +652,7 @@ static inline void sysfs_remove_group(struct kobject *kobj,
 }
 
 static inline void sysfs_remove_groups(struct kobject *kobj,
-                                      const struct attribute_group **groups)
+                                      const struct attribute_group *const *groups)
 {
 }
 
@@ -733,7 +733,7 @@ static inline int sysfs_change_owner(struct kobject *kobj, kuid_t kuid, kgid_t k
 }
 
 static inline int sysfs_groups_change_owner(struct kobject *kobj,
-                         const struct attribute_group **groups,
+                         const struct attribute_group *const *groups,
                          kuid_t kuid, kgid_t kgid)
 {
        return 0;