Re: [PATCH] cpuidle: use default_groups in kobj_type

From: Rafael J. Wysocki
Date: Thu Jan 06 2022 - 12:27:03 EST


On Tue, Jan 4, 2022 at 5:43 PM Greg Kroah-Hartman
<gregkh@xxxxxxxxxxxxxxxxxxx> wrote:
>
> 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 cpuidle 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: "Rafael J. Wysocki" <rafael@xxxxxxxxxx>
> Cc: Daniel Lezcano <daniel.lezcano@xxxxxxxxxx>
> Cc: linux-pm@xxxxxxxxxxxxxxx
> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
> ---
> drivers/cpuidle/sysfs.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/cpuidle/sysfs.c b/drivers/cpuidle/sysfs.c
> index 469e18547d06..565ed005833a 100644
> --- a/drivers/cpuidle/sysfs.c
> +++ b/drivers/cpuidle/sysfs.c
> @@ -335,6 +335,7 @@ static struct attribute *cpuidle_state_default_attrs[] = {
> &attr_default_status.attr,
> NULL
> };
> +ATTRIBUTE_GROUPS(cpuidle_state_default);
>
> struct cpuidle_state_kobj {
> struct cpuidle_state *state;
> @@ -448,7 +449,7 @@ static void cpuidle_state_sysfs_release(struct kobject *kobj)
>
> static struct kobj_type ktype_state_cpuidle = {
> .sysfs_ops = &cpuidle_state_sysfs_ops,
> - .default_attrs = cpuidle_state_default_attrs,
> + .default_groups = cpuidle_state_default_groups,
> .release = cpuidle_state_sysfs_release,
> };
>
> @@ -591,10 +592,11 @@ static struct attribute *cpuidle_driver_default_attrs[] = {
> &attr_driver_name.attr,
> NULL
> };
> +ATTRIBUTE_GROUPS(cpuidle_driver_default);
>
> static struct kobj_type ktype_driver_cpuidle = {
> .sysfs_ops = &cpuidle_driver_sysfs_ops,
> - .default_attrs = cpuidle_driver_default_attrs,
> + .default_groups = cpuidle_driver_default_groups,
> .release = cpuidle_driver_sysfs_release,
> };
>
> --

Applied as 5.17 material, thanks!