Skip to content

Commit ab6d0f5

Browse files
committed
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 aa30f47 ("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/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent ad8a5d1 commit ab6d0f5

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

drivers/firmware/dmi-sysfs.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -302,12 +302,12 @@ static struct attribute *dmi_sysfs_sel_attrs[] = {
302302
&dmi_sysfs_attr_sel_per_log_type_descriptor_length.attr,
303303
NULL,
304304
};
305-
305+
ATTRIBUTE_GROUPS(dmi_sysfs_sel);
306306

307307
static struct kobj_type dmi_system_event_log_ktype = {
308308
.release = dmi_entry_free,
309309
.sysfs_ops = &dmi_sysfs_specialize_attr_ops,
310-
.default_attrs = dmi_sysfs_sel_attrs,
310+
.default_groups = dmi_sysfs_sel_groups,
311311
};
312312

313313
typedef u8 (*sel_io_reader)(const struct dmi_system_event_log *sel,
@@ -518,6 +518,7 @@ static struct attribute *dmi_sysfs_entry_attrs[] = {
518518
&dmi_sysfs_attr_entry_position.attr,
519519
NULL,
520520
};
521+
ATTRIBUTE_GROUPS(dmi_sysfs_entry);
521522

522523
static ssize_t dmi_entry_raw_read_helper(struct dmi_sysfs_entry *entry,
523524
const struct dmi_header *dh,
@@ -565,7 +566,7 @@ static void dmi_sysfs_entry_release(struct kobject *kobj)
565566
static struct kobj_type dmi_sysfs_entry_ktype = {
566567
.release = dmi_sysfs_entry_release,
567568
.sysfs_ops = &dmi_sysfs_attr_ops,
568-
.default_attrs = dmi_sysfs_entry_attrs,
569+
.default_groups = dmi_sysfs_entry_groups,
569570
};
570571

571572
static struct kset *dmi_kset;

0 commit comments

Comments
 (0)