summaryrefslogtreecommitdiffstats
path: root/drivers/power
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-12-29 15:09:08 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-01-26 15:55:39 +0100
commita8e223094c7a82fc31b15262c4d41f23c354578f (patch)
tree71e86c2092b5ae5d30c34acb07ea5754778936d6 /drivers/power
parentNFS: use default_groups in kobj_type (diff)
downloadlinux-a8e223094c7a82fc31b15262c4d41f23c354578f.tar.xz
linux-a8e223094c7a82fc31b15262c4d41f23c354578f.zip
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 <sre@kernel.org> Cc: linux-pm@vger.kernel.org Link: https://lore.kernel.org/r/20211229140908.2523513-1-gregkh@linuxfoundation.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/power')
-rw-r--r--drivers/power/supply/ab8500_chargalg.c5
-rw-r--r--drivers/power/supply/ab8500_fg.c3
2 files changed, 5 insertions, 3 deletions
diff --git a/drivers/power/supply/ab8500_chargalg.c b/drivers/power/supply/ab8500_chargalg.c
index c4a2fe07126c..64a3f5bbfff1 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 b0919a6a6587..69e7403c2001 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,
};
/**