From: Greg Kroah-Hartman Date: Wed, 29 Dec 2021 14:09:08 +0000 (+0100) Subject: power_supply: ab8500: use default_groups in kobj_type X-Git-Tag: v6.6.17~7877^2~52 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a8e223094c7a82fc31b15262c4d41f23c354578f;p=platform%2Fkernel%2Flinux-rpi.git power_supply: ab8500: 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 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 Cc: linux-pm@vger.kernel.org Link: https://lore.kernel.org/r/20211229140908.2523513-1-gregkh@linuxfoundation.org Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/power/supply/ab8500_chargalg.c b/drivers/power/supply/ab8500_chargalg.c index c4a2fe0..64a3f5bb 100644 --- a/drivers/power/supply/ab8500_chargalg.c +++ b/drivers/power/supply/ab8500_chargalg.c @@ -1866,11 +1866,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, @@ -1879,7 +1880,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 b0919a6..69e7403 100644 --- a/drivers/power/supply/ab8500_fg.c +++ b/drivers/power/supply/ab8500_fg.c @@ -2490,10 +2490,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, }; /**