Messages in this thread Patch in this message | | | From | Greg Kroah-Hartman <> | Subject | [PATCH] power_supply: ab8500: use default_groups in kobj_type | Date | Wed, 29 Dec 2021 15:09:08 +0100 |
| |
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 ab8500 power supply sysfs code to use default_groups field which has been the preferred way since aa30f47cf666 ("kobject: Add support for default attribute groups to kobj_type") so that we can soon get rid of the obsolete default_attrs field.
Cc: Sebastian Reichel <sre@kernel.org> Cc: linux-pm@vger.kernel.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- drivers/power/supply/ab8500_chargalg.c | 5 +++-- drivers/power/supply/ab8500_fg.c | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/drivers/power/supply/ab8500_chargalg.c b/drivers/power/supply/ab8500_chargalg.c index ff4b26b1ceca..42689ac2d898 100644 --- a/drivers/power/supply/ab8500_chargalg.c +++ b/drivers/power/supply/ab8500_chargalg.c @@ -1865,11 +1865,12 @@ static ssize_t ab8500_chargalg_sysfs_charger(struct kobject *kobj, return entry->store(di, buf, length); } -static struct attribute *ab8500_chargalg_chg[] = { +static struct attribute *ab8500_chargalg_attrs[] = { &ab8500_chargalg_en_charger.attr, &ab8500_chargalg_curr_step.attr, NULL, }; +ATTRIBUTE_GROUPS(ab8500_chargalg); static const struct sysfs_ops ab8500_chargalg_sysfs_ops = { .show = ab8500_chargalg_sysfs_show, @@ -1878,7 +1879,7 @@ static const struct sysfs_ops ab8500_chargalg_sysfs_ops = { static struct kobj_type ab8500_chargalg_ktype = { .sysfs_ops = &ab8500_chargalg_sysfs_ops, - .default_attrs = ab8500_chargalg_chg, + .default_groups = ab8500_chargalg_groups, }; /** diff --git a/drivers/power/supply/ab8500_fg.c b/drivers/power/supply/ab8500_fg.c index 05fe9724ba50..6820e19380b5 100644 --- a/drivers/power/supply/ab8500_fg.c +++ b/drivers/power/supply/ab8500_fg.c @@ -2514,10 +2514,11 @@ static struct attribute *ab8500_fg_attrs[] = { &charge_now_attr.attr, NULL, }; +ATTRIBUTE_GROUPS(ab8500_fg); static struct kobj_type ab8500_fg_ktype = { .sysfs_ops = &ab8500_fg_sysfs_ops, - .default_attrs = ab8500_fg_attrs, + .default_groups = ab8500_fg_groups, }; /** -- 2.34.1
| |