]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
sysfs: remove attribute_group::bin_attrs_new
authorThomas Weißschuh <linux@weissschuh.net>
Mon, 11 Aug 2025 09:13:36 +0000 (11:13 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 19 Aug 2025 11:12:12 +0000 (13:12 +0200)
This transitional field is now unused and unnecessary.
Remove it.

Signed-off-by: Thomas Weißschuh <linux@weissschuh.net>
Link: https://lore.kernel.org/r/20250811-sysfs-const-bin_attr-final-v4-2-7b6053fd58bb@weissschuh.net
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
include/linux/sysfs.h

index 7544f6d81c05982b5d168624f376cd647127ab51..9a25a29116528fab77d667390dd3ef5957b86554 100644 (file)
@@ -106,10 +106,7 @@ struct attribute_group {
                                            const struct bin_attribute *,
                                            int);
        struct attribute        **attrs;
-       union {
-               const struct bin_attribute      *const *bin_attrs;
-               const struct bin_attribute      *const *bin_attrs_new;
-       };
+       const struct bin_attribute      *const *bin_attrs;
 };
 
 #define SYSFS_PREALLOC         010000
@@ -293,7 +290,7 @@ __ATTRIBUTE_GROUPS(_name)
 
 #define BIN_ATTRIBUTE_GROUPS(_name)                            \
 static const struct attribute_group _name##_group = {          \
-       .bin_attrs_new = _name##_attrs,                         \
+       .bin_attrs = _name##_attrs,                             \
 };                                                             \
 __ATTRIBUTE_GROUPS(_name)