[PATCH] sh: sq: use default_groups in kobj_type

[PATCH] sh: sq: use default_groups in kobj_type

[Greg Kroah-Hartman]

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 sh sq 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: Yoshinori Sato <ysato@users.sourceforge.jp>
Cc: Rich Felker <dalias@libc.org>
Cc: linux-sh@vger.kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 arch/sh/kernel/cpu/sh4/sq.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/sh/kernel/cpu/sh4/sq.c b/arch/sh/kernel/cpu/sh4/sq.c
index d432164b23b7..a76b94e41e91 100644
--- a/arch/sh/kernel/cpu/sh4/sq.c
+++ b/arch/sh/kernel/cpu/sh4/sq.c
@@ -324,6 +324,7 @@ static struct attribute *sq_sysfs_attrs[] = {
 	&mapping_attr.attr,
 	NULL,
 };
+ATTRIBUTE_GROUPS(sq_sysfs);
 
 static const struct sysfs_ops sq_sysfs_ops = {
 	.show	= sq_sysfs_show,
@@ -332,7 +333,7 @@ static const struct sysfs_ops sq_sysfs_ops = {
 
 static struct kobj_type ktype_percpu_entry = {
 	.sysfs_ops	= &sq_sysfs_ops,
-	.default_attrs	= sq_sysfs_attrs,
+	.default_groups	= sq_sysfs_groups,
 };
 
 static int sq_dev_add(struct device *dev, struct subsys_interface *sif)
-- 
2.34.1

Re: [PATCH] sh: sq: use default_groups in kobj_type

[Rob Landley]

On 1/4/22 10:22 AM, Greg Kroah-Hartman 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 sh sq 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.

Let's see, sh4-specific, depends on CONFIG_SH_STORE_QUEUES... it built but I'm
not finding an "sq" entry under /proc. (Or anything with "mapping" in it...)

Oh well, probably right? Didn't break anything for me:

Tested-by: Rob Landley <rob@landley.net>

Rob

Re: [PATCH] sh: sq: use default_groups in kobj_type

[Greg Kroah-Hartman]

On Wed, Jan 05, 2022 at 11:46:28AM -0600, Rob Landley wrote:
> On 1/4/22 10:22 AM, Greg Kroah-Hartman 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 sh sq 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.
> 
> Let's see, sh4-specific, depends on CONFIG_SH_STORE_QUEUES... it built but I'm
> not finding an "sq" entry under /proc. (Or anything with "mapping" in it...)
> 
> Oh well, probably right? Didn't break anything for me:
> 
> Tested-by: Rob Landley <rob@landley.net>

Thanks!  Seems to pass 0-day testing as well :)

Should I take this in my tree?

greg k-h

Re: [PATCH] sh: sq: use default_groups in kobj_type

[Rob Landley]

On 1/5/22 11:52 AM, Greg Kroah-Hartman wrote:
> On Wed, Jan 05, 2022 at 11:46:28AM -0600, Rob Landley wrote:
>> On 1/4/22 10:22 AM, Greg Kroah-Hartman 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 sh sq 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.
>> 
>> Let's see, sh4-specific, depends on CONFIG_SH_STORE_QUEUES... it built but I'm
>> not finding an "sq" entry under /proc. (Or anything with "mapping" in it...)
>> 
>> Oh well, probably right? Didn't break anything for me:
>> 
>> Tested-by: Rob Landley <rob@landley.net>
> 
> Thanks!  Seems to pass 0-day testing as well :)
> 
> Should I take this in my tree?

Yes please.

Rob

Re: [PATCH] sh: sq: use default_groups in kobj_type

[Greg Kroah-Hartman]

On Wed, Jan 05, 2022 at 12:11:25PM -0600, Rob Landley wrote:
> On 1/5/22 11:52 AM, Greg Kroah-Hartman wrote:
> > On Wed, Jan 05, 2022 at 11:46:28AM -0600, Rob Landley wrote:
> >> On 1/4/22 10:22 AM, Greg Kroah-Hartman 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 sh sq 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.
> >> 
> >> Let's see, sh4-specific, depends on CONFIG_SH_STORE_QUEUES... it built but I'm
> >> not finding an "sq" entry under /proc. (Or anything with "mapping" in it...)
> >> 
> >> Oh well, probably right? Didn't break anything for me:
> >> 
> >> Tested-by: Rob Landley <rob@landley.net>
> > 
> > Thanks!  Seems to pass 0-day testing as well :)
> > 
> > Should I take this in my tree?
> 
> Yes please.

Wonderful, will go do that now.

greg k-h