firmware: dmi-sysfs: use default_groups in kobj_type

There are currently 2 ways to create a set of sysfs files for a
kobj_type, through the default_attrs field, and the default_groups
field.  Move the firmware dmi-sysfs sysfs code to use default_groups
field which has been the preferred way since aa30f47cf6 ("kobject: Add
support for default attribute groups to kobj_type") so that we can soon
get rid of the obsolete default_attrs field.

Link: https://lore.kernel.org/r/20220105181719.2737782-1-gregkh@linuxfoundation.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman 2022-01-05 19:17:19 +01:00
parent ad8a5d1d2f
commit ab6d0f57be

View File

@ -302,12 +302,12 @@ static struct attribute *dmi_sysfs_sel_attrs[] = {
&dmi_sysfs_attr_sel_per_log_type_descriptor_length.attr, &dmi_sysfs_attr_sel_per_log_type_descriptor_length.attr,
NULL, NULL,
}; };
ATTRIBUTE_GROUPS(dmi_sysfs_sel);
static struct kobj_type dmi_system_event_log_ktype = { static struct kobj_type dmi_system_event_log_ktype = {
.release = dmi_entry_free, .release = dmi_entry_free,
.sysfs_ops = &dmi_sysfs_specialize_attr_ops, .sysfs_ops = &dmi_sysfs_specialize_attr_ops,
.default_attrs = dmi_sysfs_sel_attrs, .default_groups = dmi_sysfs_sel_groups,
}; };
typedef u8 (*sel_io_reader)(const struct dmi_system_event_log *sel, typedef u8 (*sel_io_reader)(const struct dmi_system_event_log *sel,
@ -518,6 +518,7 @@ static struct attribute *dmi_sysfs_entry_attrs[] = {
&dmi_sysfs_attr_entry_position.attr, &dmi_sysfs_attr_entry_position.attr,
NULL, NULL,
}; };
ATTRIBUTE_GROUPS(dmi_sysfs_entry);
static ssize_t dmi_entry_raw_read_helper(struct dmi_sysfs_entry *entry, static ssize_t dmi_entry_raw_read_helper(struct dmi_sysfs_entry *entry,
const struct dmi_header *dh, const struct dmi_header *dh,
@ -565,7 +566,7 @@ static void dmi_sysfs_entry_release(struct kobject *kobj)
static struct kobj_type dmi_sysfs_entry_ktype = { static struct kobj_type dmi_sysfs_entry_ktype = {
.release = dmi_sysfs_entry_release, .release = dmi_sysfs_entry_release,
.sysfs_ops = &dmi_sysfs_attr_ops, .sysfs_ops = &dmi_sysfs_attr_ops,
.default_attrs = dmi_sysfs_entry_attrs, .default_groups = dmi_sysfs_entry_groups,
}; };
static struct kset *dmi_kset; static struct kset *dmi_kset;