From a8e223094c7a82fc31b15262c4d41f23c354578f Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 29 Dec 2021 15:09:08 +0100 Subject: 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 --- drivers/power/supply/ab8500_chargalg.c | 5 +++-- drivers/power/supply/ab8500_fg.c | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'drivers/power') 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, }; /** -- cgit v1.2.3 From 5730c81df7a3b26750d9e6b4ae62bcec47ab2375 Mon Sep 17 00:00:00 2001 From: Yong Wu Date: Mon, 14 Feb 2022 14:08:17 +0800 Subject: power: supply: ab8500: Make use of the helper component_compare_dev Use the common compare helper from component. Cc: Sebastian Reichel Cc: linux-pm@vger.kernel.org Signed-off-by: Yong Wu Link: https://lore.kernel.org/r/20220214060819.7334-22-yong.wu@mediatek.com Signed-off-by: Greg Kroah-Hartman --- drivers/power/supply/ab8500_charger.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'drivers/power') diff --git a/drivers/power/supply/ab8500_charger.c b/drivers/power/supply/ab8500_charger.c index ce074c018dcb..875fe665f8a8 100644 --- a/drivers/power/supply/ab8500_charger.c +++ b/drivers/power/supply/ab8500_charger.c @@ -3414,11 +3414,6 @@ static struct platform_driver *const ab8500_charger_component_drivers[] = { &ab8500_chargalg_driver, }; -static int ab8500_charger_compare_dev(struct device *dev, void *data) -{ - return dev == data; -} - static int ab8500_charger_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; @@ -3657,8 +3652,7 @@ static int ab8500_charger_probe(struct platform_device *pdev) while ((d = platform_find_device_by_driver(p, drv))) { put_device(p); - component_match_add(dev, &match, - ab8500_charger_compare_dev, d); + component_match_add(dev, &match, component_compare_dev, d); p = d; } put_device(p); -- cgit v1.2.3