Commit a8e22309 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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 aa30f47c ("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
Link: https://lore.kernel.org/r/20211229140908.2523513-1-gregkh@linuxfoundation.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6c5092de

drivers/power/supply/ab8500_chargalg.c

+3 −2
Original line number Diff line number Diff line
@@ -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,

};



/**

drivers/power/supply/ab8500_fg.c

+2 −1
Original line number Diff line number Diff line
@@ -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,

};



/**