[PATCH 4/4] module: sysfs: Use const 'struct bin_attribute'

[Thomas Weißschuh]

The sysfs core is switching to 'const struct bin_attribute's.
Prepare for that.

Signed-off-by: Thomas Weißschuh <li...@weissschuh.net>
---
 kernel/module/sysfs.c | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/kernel/module/sysfs.c b/kernel/module/sysfs.c
index 
4f37970f99c999589257713926395686f03103e6..99177cd55f7edec05abd079577ccf161666d8a20
 100644
--- a/kernel/module/sysfs.c
+++ b/kernel/module/sysfs.c
@@ -31,11 +31,11 @@ struct module_sect_attrs {
 
 #define MODULE_SECT_READ_SIZE (3 /* "0x", "\n" */ + (BITS_PER_LONG / 4))
 static ssize_t module_sect_read(struct file *file, struct kobject *kobj,
-                               struct bin_attribute *battr,
+                               const struct bin_attribute *battr,
                                char *buf, loff_t pos, size_t count)
 {
-       struct module_sect_attr *sattr =
-               container_of(battr, struct module_sect_attr, battr);
+       const struct module_sect_attr *sattr =
+               container_of_const(battr, struct module_sect_attr, battr);
        char bounce[MODULE_SECT_READ_SIZE + 1];
        size_t wrote;
 
@@ -61,11 +61,11 @@ static ssize_t module_sect_read(struct file *file, struct 
kobject *kobj,
 
 static void free_sect_attrs(struct module_sect_attrs *sect_attrs)
 {
-       struct bin_attribute **bin_attr;
+       const struct bin_attribute *const *bin_attr;
 
-       for (bin_attr = sect_attrs->grp.bin_attrs; *bin_attr; bin_attr++)
+       for (bin_attr = sect_attrs->grp.bin_attrs_new; *bin_attr; bin_attr++)
                kfree((*bin_attr)->attr.name);
-       kfree(sect_attrs->grp.bin_attrs);
+       kfree(sect_attrs->grp.bin_attrs_new);
        kfree(sect_attrs);
 }
 
@@ -73,7 +73,7 @@ static int add_sect_attrs(struct module *mod, const struct 
load_info *info)
 {
        struct module_sect_attrs *sect_attrs;
        struct module_sect_attr *sattr;
-       struct bin_attribute **gattr;
+       const struct bin_attribute **gattr;
        unsigned int nloaded = 0, i;
        int ret;
 
@@ -93,7 +93,7 @@ static int add_sect_attrs(struct module *mod, const struct 
load_info *info)
 
        /* Setup section attributes. */
        sect_attrs->grp.name = "sections";
-       sect_attrs->grp.bin_attrs = gattr;
+       sect_attrs->grp.bin_attrs_new = gattr;
 
        sattr = &sect_attrs->attrs[0];
        for (i = 0; i < info->hdr->e_shnum; i++) {
@@ -109,7 +109,7 @@ static int add_sect_attrs(struct module *mod, const struct 
load_info *info)
                        ret = -ENOMEM;
                        goto out;
                }
-               sattr->battr.read = module_sect_read;
+               sattr->battr.read_new = module_sect_read;
                sattr->battr.size = MODULE_SECT_READ_SIZE;
                sattr->battr.attr.mode = 0400;
                *(gattr++) = &(sattr++)->battr;
@@ -151,11 +151,11 @@ struct module_notes_attrs {
 
 static void free_notes_attrs(struct module_notes_attrs *notes_attrs)
 {
-       struct bin_attribute **bin_attr;
+       const struct bin_attribute *const *bin_attr;
 
-       for (bin_attr = notes_attrs->grp.bin_attrs; *bin_attr; bin_attr++)
+       for (bin_attr = notes_attrs->grp.bin_attrs_new; *bin_attr; bin_attr++)
                kfree((*bin_attr)->attr.name);
-       kfree(notes_attrs->grp.bin_attrs);
+       kfree(notes_attrs->grp.bin_attrs_new);
        kfree(notes_attrs);
 }
 
@@ -163,7 +163,7 @@ static int add_notes_attrs(struct module *mod, const struct 
load_info *info)
 {
        unsigned int notes, loaded, i;
        struct module_notes_attrs *notes_attrs;
-       struct bin_attribute **gattr;
+       const struct bin_attribute **gattr;
        struct bin_attribute *nattr;
        int ret;
 
@@ -189,7 +189,7 @@ static int add_notes_attrs(struct module *mod, const struct 
load_info *info)
        }
 
        notes_attrs->grp.name = "notes";
-       notes_attrs->grp.bin_attrs = gattr;
+       notes_attrs->grp.bin_attrs_new = gattr;
 
        nattr = &notes_attrs->attrs[0];
        for (loaded = i = 0; i < info->hdr->e_shnum; ++i) {

-- 
2.47.1