[PATCH] ALSA: aoa: convert bus code to use dev_groups

You should use dev_groups instead of the dev_attrs field of struct
bus_type. This converts the MDIO bus code to use the correct field.

These modifications were made using Coccinelle.

Signed-off-by: Quentin Lambert <redacted>
---
 sound/aoa/soundbus/core.c     |    3 ++-
 sound/aoa/soundbus/soundbus.h |    2 +-
 sound/aoa/soundbus/sysfs.c    |   13 ++++++++-----
 3 files changed, 11 insertions(+), 7 deletions(-)

--- a/sound/aoa/soundbus/core.c
+++ b/sound/aoa/soundbus/core.c

@@ -150,6 +150,7 @@ static int soundbus_device_resume(struct
 
 #endif /* CONFIG_PM */
 
+ATTRIBUTE_GROUPS(soundbus_dev);
 static struct bus_type soundbus_bus_type = {
 	.name		= "aoa-soundbus",
 	.probe		= soundbus_probe,

@@ -160,7 +161,7 @@ static struct bus_type soundbus_bus_type
 	.suspend	= soundbus_device_suspend,
 	.resume		= soundbus_device_resume,
 #endif
-	.dev_attrs	= soundbus_dev_attrs,
+	.dev_groups	= soundbus_dev_groups,
 };
 
 int soundbus_add_one(struct soundbus_dev *dev)
--- a/sound/aoa/soundbus/soundbus.h
+++ b/sound/aoa/soundbus/soundbus.h

@@ -199,6 +199,6 @@ struct soundbus_driver {
 extern int soundbus_register_driver(struct soundbus_driver *drv);
 extern void soundbus_unregister_driver(struct soundbus_driver *drv);
 
-extern struct device_attribute soundbus_dev_attrs[];
+extern struct attribute *soundbus_dev_attrs[];
 
 #endif /* __SOUNDBUS_H */
--- a/sound/aoa/soundbus/sysfs.c
+++ b/sound/aoa/soundbus/sysfs.c

@@ -30,13 +30,16 @@ static ssize_t modalias_show(struct devi
 
 	return length;
 }
+static DEVICE_ATTR_RO(modalias);
 
 soundbus_config_of_attr (name, "%s\n");
+static DEVICE_ATTR_RO(name);
 soundbus_config_of_attr (type, "%s\n");
+static DEVICE_ATTR_RO(type);
 
-struct device_attribute soundbus_dev_attrs[] = {
-	__ATTR_RO(name),
-	__ATTR_RO(type),
-	__ATTR_RO(modalias),
-	__ATTR_NULL
+struct attribute *soundbus_dev_attrs[] = {
+	&dev_attr_name.attr,
+	&dev_attr_type.attr,
+	&dev_attr_modalias.attr,
+	NULL,
 };

At Thu, 28 May 2015 14:48:27 +0200,
Quentin Lambert wrote:

You should use dev_groups instead of the dev_attrs field of struct
bus_type. This converts the MDIO bus code to use the correct field.

These modifications were made using Coccinelle.

Signed-off-by: Quentin Lambert <redacted>

What's wrong with dev_attrs?
(Not offending, I'm just curious where the preference for dev_groups
 is referred...)


thanks,

Takashi

On 28/05/2015 15:52, Takashi Iwai wrote:

At Thu, 28 May 2015 14:48:27 +0200,
Quentin Lambert wrote:

quoted

You should use dev_groups instead of the dev_attrs field of struct
bus_type. This converts the MDIO bus code to use the correct field.

These modifications were made using Coccinelle.

Signed-off-by: Quentin Lambert <redacted>

What's wrong with dev_attrs?
(Not offending, I'm just curious where the preference for dev_groups
  is referred...)

This patch is based on commit 4192c74940e23da727eb02b7b4ee779dde2f670,
its message indicates that dev_attrs is going away.

Quentin

On 28/05/2015 15:52, Takashi Iwai wrote:

At Thu, 28 May 2015 14:48:27 +0200,
Quentin Lambert wrote:

quoted

You should use dev_groups instead of the dev_attrs field of struct
bus_type. This converts the MDIO bus code to use the correct field.

These modifications were made using Coccinelle.

Signed-off-by: Quentin Lambert <redacted>

What's wrong with dev_attrs?
(Not offending, I'm just curious where the preference for dev_groups
  is referred...)

This patch is based on commit 4192c74940e23da727eb02b7b4ee779dde2f670,
its message indicates that dev_attrs is going away.

Quentin

At Thu, 28 May 2015 15:59:50 +0200,
Quentin Lambert wrote:

On 28/05/2015 15:52, Takashi Iwai wrote:

quoted

At Thu, 28 May 2015 14:48:27 +0200,
Quentin Lambert wrote:

quoted

You should use dev_groups instead of the dev_attrs field of struct
bus_type. This converts the MDIO bus code to use the correct field.

These modifications were made using Coccinelle.

Signed-off-by: Quentin Lambert <redacted>

What's wrong with dev_attrs?
(Not offending, I'm just curious where the preference for dev_groups
  is referred...)

This patch is based on commit 4192c74940e23da727eb02b7b4ee779dde2f670,
its message indicates that dev_attrs is going away.

OK, makes sense.  Then please keep such information in the changelog.
BTW, the code in question isn't MDIO at all.

Also, it'd be better to move ATTRIBUTE_GROUPS(soundbus_dev) into
soundbus/sysfs.c, and make it this global instead of
soundbus_dev_attrs[].


Takashi

On 28/05/2015 16:09, Takashi Iwai wrote:

At Thu, 28 May 2015 15:59:50 +0200,
Quentin Lambert wrote:

quoted

On 28/05/2015 15:52, Takashi Iwai wrote:

quoted

At Thu, 28 May 2015 14:48:27 +0200,
Quentin Lambert wrote:

quoted

You should use dev_groups instead of the dev_attrs field of struct
bus_type. This converts the MDIO bus code to use the correct field.

These modifications were made using Coccinelle.

Signed-off-by: Quentin Lambert <redacted>

What's wrong with dev_attrs?
(Not offending, I'm just curious where the preference for dev_groups
   is referred...)

This patch is based on commit 4192c74940e23da727eb02b7b4ee779dde2f670,
its message indicates that dev_attrs is going away.

OK, makes sense.  Then please keep such information in the changelog.
BTW, the code in question isn't MDIO at all.

Sorry, about that!

Also, it'd be better to move ATTRIBUTE_GROUPS(soundbus_dev) into
soundbus/sysfs.c, and make it this global instead of
soundbus_dev_attrs[].

Ok, I need to find a nice way to do that because ATTRIBUTE_GROUPS 
declares the
structure as static. I will send a second version with a better solution.

Quentin

Takashi

At Thu, 28 May 2015 16:43:12 +0200,
Quentin Lambert wrote:

On 28/05/2015 16:09, Takashi Iwai wrote:

quoted

At Thu, 28 May 2015 15:59:50 +0200,
Quentin Lambert wrote:

quoted

On 28/05/2015 15:52, Takashi Iwai wrote:

quoted

At Thu, 28 May 2015 14:48:27 +0200,
Quentin Lambert wrote:

quoted

You should use dev_groups instead of the dev_attrs field of struct
bus_type. This converts the MDIO bus code to use the correct field.

These modifications were made using Coccinelle.

Signed-off-by: Quentin Lambert <redacted>

What's wrong with dev_attrs?
(Not offending, I'm just curious where the preference for dev_groups
   is referred...)

This patch is based on commit 4192c74940e23da727eb02b7b4ee779dde2f670,
its message indicates that dev_attrs is going away.

OK, makes sense.  Then please keep such information in the changelog.
BTW, the code in question isn't MDIO at all.

Sorry, about that!

quoted

Also, it'd be better to move ATTRIBUTE_GROUPS(soundbus_dev) into
soundbus/sysfs.c, and make it this global instead of
soundbus_dev_attrs[].

Ok, I need to find a nice way to do that because ATTRIBUTE_GROUPS 
declares the
structure as static.

Ah, right.  I fell to the same pintfall in the past, too :)

I will send a second version with a better solution.

If it results in an ungly code, it's fine with the original code,
too.  But, maybe with a comment indicating that xxx_dev_attrs[] is
defined in xxx.c.


thanks,

Takashi

On 28/05/2015 17:01, Takashi Iwai wrote:

quoted

quoted

Also, it'd be better to move ATTRIBUTE_GROUPS(soundbus_dev) into
soundbus/sysfs.c, and make it this global instead of
soundbus_dev_attrs[].

Ok, I need to find a nice way to do that because ATTRIBUTE_GROUPS
declares the
structure as static.

If it results in an ungly code, it's fine with the original code,
too.  But, maybe with a comment indicating that xxx_dev_attrs[] is
defined in xxx.c.

Since sound/aoa/soundbus/sysfs is small, a solution would be
to merge sound/aoa/soundbus/sysfs.c and sound/aoa/soundus/core.c.
Moreover all 172 other usages of the ATTRIBUTE_GROUPS macro
define the struct attribute *xxx_attrs[] in the same file
they assign the .dev_groups field.

I'm not sure about this change as it seems way more important than
adding a comment line as you suggested.

Should I send a patch merging these two files?

Quentin

At Fri, 29 May 2015 17:49:06 +0200,
Quentin Lambert wrote:

On 28/05/2015 17:01, Takashi Iwai wrote:

quoted

quoted

quoted

Also, it'd be better to move ATTRIBUTE_GROUPS(soundbus_dev) into
soundbus/sysfs.c, and make it this global instead of
soundbus_dev_attrs[].

Ok, I need to find a nice way to do that because ATTRIBUTE_GROUPS
declares the
structure as static.

If it results in an ungly code, it's fine with the original code,
too.  But, maybe with a comment indicating that xxx_dev_attrs[] is
defined in xxx.c.

Since sound/aoa/soundbus/sysfs is small, a solution would be
to merge sound/aoa/soundbus/sysfs.c and sound/aoa/soundus/core.c.
Moreover all 172 other usages of the ATTRIBUTE_GROUPS macro
define the struct attribute *xxx_attrs[] in the same file
they assign the .dev_groups field.

I'm not sure about this change as it seems way more important than
adding a comment line as you suggested.

Not "important" but more "radical", I'd say.

Should I send a patch merging these two files?

I don't think it's worth.  This is a fairly old hardware, thus the
code isn't so actively used/maintained.  Unless it looks too ugly, we
shouldn't touch too many things just for refactoring.

So, go for the way to have a minimum change.


thanks,

Takashi

The dev_attrs field of struct bus_type is going away, use dev_groups instead.
This converts the soundbus code to use the correct field.

Given that all other usages of the macro define the struct attribute
*xxx_attrs[] in the same file they assign the .dev_groups field, this patch
merges sysfs.c into core.c.

These modifications were made using Coccinelle.

Signed-off-by: Quentin Lambert <redacted>
---
 Changes since v1:
  - Fix the commit message to actually talk about soundbus rather than MDIO
  - This version attempt to fix a problem resulting from the macro
    ATTRIBUTE_GROUPS declaring the structure as static by merging sysfs.c into
    core.c. I understand that this may not be the prefered solution since 
    Takashi suggested that adding a comment line to the previous version could
    be acceptable. 

 sound/aoa/soundbus/Makefile   |    2 -
 sound/aoa/soundbus/core.c     |   44 +++++++++++++++++++++++++++++++++++++++++-
 sound/aoa/soundbus/soundbus.h |    2 -
 sound/aoa/soundbus/sysfs.c    |   42 ----------------------------------------
 4 files changed, 44 insertions(+), 46 deletions(-)

--- a/sound/aoa/soundbus/Makefile
+++ b/sound/aoa/soundbus/Makefile

@@ -1,3 +1,3 @@
 obj-$(CONFIG_SND_AOA_SOUNDBUS) += snd-aoa-soundbus.o
-snd-aoa-soundbus-objs := core.o sysfs.o
+snd-aoa-soundbus-objs := core.o
 obj-$(CONFIG_SND_AOA_SOUNDBUS_I2S) += i2sbus/
--- a/sound/aoa/soundbus/core.c
+++ b/sound/aoa/soundbus/core.c

@@ -150,6 +150,48 @@ static int soundbus_device_resume(struct
 
 #endif /* CONFIG_PM */
 
+#define soundbus_config_of_attr(field, format_string)			\
+static ssize_t								\
+field##_show (struct device *dev, struct device_attribute *attr,	\
+              char *buf)						\
+{									\
+	struct soundbus_dev *mdev = to_soundbus_device (dev);		\
+	return sprintf (buf, format_string, mdev->ofdev.dev.of_node->field); \
+}
+
+static ssize_t modalias_show(struct device *dev, struct device_attribute *attr,
+			     char *buf)
+{
+	struct soundbus_dev *sdev = to_soundbus_device(dev);
+	struct platform_device *of = &sdev->ofdev;
+	int length;
+
+	if (*sdev->modalias) {
+		strlcpy(buf, sdev->modalias, sizeof(sdev->modalias) + 1);
+		strcat(buf, "\n");
+		length = strlen(buf);
+	} else {
+		length = sprintf(buf, "of:N%sT%s\n",
+				 of->dev.of_node->name, of->dev.of_node->type);
+	}
+
+	return length;
+}
+static DEVICE_ATTR_RO(modalias);
+
+soundbus_config_of_attr (name, "%s\n");
+static DEVICE_ATTR_RO(name);
+soundbus_config_of_attr (type, "%s\n");
+static DEVICE_ATTR_RO(type);
+
+struct attribute *soundbus_dev_attrs[] = {
+	&dev_attr_name.attr,
+	&dev_attr_type.attr,
+	&dev_attr_modalias.attr,
+	NULL,
+};
+ATTRIBUTE_GROUPS(soundbus_dev);
+
 static struct bus_type soundbus_bus_type = {
 	.name		= "aoa-soundbus",
 	.probe		= soundbus_probe,

@@ -160,7 +202,7 @@ static struct bus_type soundbus_bus_type
 	.suspend	= soundbus_device_suspend,
 	.resume		= soundbus_device_resume,
 #endif
-	.dev_attrs	= soundbus_dev_attrs,
+	.dev_groups	= soundbus_dev_groups,
 };
 
 int soundbus_add_one(struct soundbus_dev *dev)
--- a/sound/aoa/soundbus/soundbus.h
+++ b/sound/aoa/soundbus/soundbus.h

@@ -199,6 +199,4 @@ struct soundbus_driver {
 extern int soundbus_register_driver(struct soundbus_driver *drv);
 extern void soundbus_unregister_driver(struct soundbus_driver *drv);
 
-extern struct device_attribute soundbus_dev_attrs[];
-
 #endif /* __SOUNDBUS_H */
--- a/sound/aoa/soundbus/sysfs.c
+++ /dev/null

@@ -1,42 +0,0 @@
-#include <linux/kernel.h>
-#include <linux/stat.h>
-/* FIX UP */
-#include "soundbus.h"
-
-#define soundbus_config_of_attr(field, format_string)			\
-static ssize_t								\
-field##_show (struct device *dev, struct device_attribute *attr,	\
-              char *buf)						\
-{									\
-	struct soundbus_dev *mdev = to_soundbus_device (dev);		\
-	return sprintf (buf, format_string, mdev->ofdev.dev.of_node->field); \
-}
-
-static ssize_t modalias_show(struct device *dev, struct device_attribute *attr,
-			     char *buf)
-{
-	struct soundbus_dev *sdev = to_soundbus_device(dev);
-	struct platform_device *of = &sdev->ofdev;
-	int length;
-
-	if (*sdev->modalias) {
-		strlcpy(buf, sdev->modalias, sizeof(sdev->modalias) + 1);
-		strcat(buf, "\n");
-		length = strlen(buf);
-	} else {
-		length = sprintf(buf, "of:N%sT%s\n",
-				 of->dev.of_node->name, of->dev.of_node->type);
-	}
-
-	return length;
-}
-
-soundbus_config_of_attr (name, "%s\n");
-soundbus_config_of_attr (type, "%s\n");
-
-struct device_attribute soundbus_dev_attrs[] = {
-	__ATTR_RO(name),
-	__ATTR_RO(type),
-	__ATTR_RO(modalias),
-	__ATTR_NULL
-};

At Thu, 11 Jun 2015 10:03:38 +0200,
Quentin Lambert wrote:

The dev_attrs field of struct bus_type is going away, use dev_groups instead.
This converts the soundbus code to use the correct field.

Given that all other usages of the macro define the struct attribute
*xxx_attrs[] in the same file they assign the .dev_groups field, this patch
merges sysfs.c into core.c.

These modifications were made using Coccinelle.

Signed-off-by: Quentin Lambert <redacted>
---
 Changes since v1:
  - Fix the commit message to actually talk about soundbus rather than MDIO
  - This version attempt to fix a problem resulting from the macro
    ATTRIBUTE_GROUPS declaring the structure as static by merging sysfs.c into
    core.c. I understand that this may not be the prefered solution since 
    Takashi suggested that adding a comment line to the previous version could
    be acceptable. 

Hmm, the patch doesn't look as mentioned here.
It's rather bigger than the previous patch.  Is this intentional?


Takashi

Am 11.06.2015 10:03, schrieb Quentin Lambert:

for my curiosity:
why not sprintf() ? almost any other code seems to use sprintf().

re,
 wh

On 11/06/2015 12:02, Takashi Iwai wrote:

At Thu, 11 Jun 2015 10:03:38 +0200,
Quentin Lambert wrote:

quoted

The dev_attrs field of struct bus_type is going away, use dev_groups instead.
This converts the soundbus code to use the correct field.

Given that all other usages of the macro define the struct attribute
*xxx_attrs[] in the same file they assign the .dev_groups field, this patch
merges sysfs.c into core.c.

These modifications were made using Coccinelle.

Signed-off-by: Quentin Lambert <redacted>
---
  Changes since v1:
   - Fix the commit message to actually talk about soundbus rather than MDIO
   - This version attempt to fix a problem resulting from the macro
     ATTRIBUTE_GROUPS declaring the structure as static by merging sysfs.c into
     core.c. I understand that this may not be the prefered solution since
     Takashi suggested that adding a comment line to the previous version could
     be acceptable.

Hmm, the patch doesn't look as mentioned here.
It's rather bigger than the previous patch.  Is this intentional?

Well as mentionned in the change log it is bigger because it moves the 
code from sysfs.c to
core.c. I realise as I am writing this that this patch should have 
really been two patches.
The first one removing sysfs.c and the second one removing the use of 
the dev_attrs.

Takashi

Quentin

On 11/06/2015 13:55, walter harms wrote:

Am 11.06.2015 10:03, schrieb Quentin Lambert:

quoted

The dev_attrs field of struct bus_type is going away, use dev_groups instead.
This converts the soundbus code to use the correct field.

Given that all other usages of the macro define the struct attribute
*xxx_attrs[] in the same file they assign the .dev_groups field, this patch
merges sysfs.c into core.c.

These modifications were made using Coccinelle.

Signed-off-by: Quentin Lambert <redacted>
---
  Changes since v1:
   - Fix the commit message to actually talk about soundbus rather than MDIO
   - This version attempt to fix a problem resulting from the macro
     ATTRIBUTE_GROUPS declaring the structure as static by merging sysfs.c into
     core.c. I understand that this may not be the prefered solution since
     Takashi suggested that adding a comment line to the previous version could
     be acceptable.

  sound/aoa/soundbus/Makefile   |    2 -
  sound/aoa/soundbus/core.c     |   44 +++++++++++++++++++++++++++++++++++++++++-
  sound/aoa/soundbus/soundbus.h |    2 -
  sound/aoa/soundbus/sysfs.c    |   42 ----------------------------------------
  4 files changed, 44 insertions(+), 46 deletions(-)

--- a/sound/aoa/soundbus/Makefile
+++ b/sound/aoa/soundbus/Makefile

@@ -1,3 +1,3 @@
  obj-$(CONFIG_SND_AOA_SOUNDBUS) += snd-aoa-soundbus.o
-snd-aoa-soundbus-objs := core.o sysfs.o
+snd-aoa-soundbus-objs := core.o
  obj-$(CONFIG_SND_AOA_SOUNDBUS_I2S) += i2sbus/
--- a/sound/aoa/soundbus/core.c
+++ b/sound/aoa/soundbus/core.c

@@ -150,6 +150,48 @@ static int soundbus_device_resume(struct
  
  #endif /* CONFIG_PM */
  
+#define soundbus_config_of_attr(field, format_string)			\
+static ssize_t								\
+field##_show (struct device *dev, struct device_attribute *attr,	\
+              char *buf)						\
+{									\
+	struct soundbus_dev *mdev = to_soundbus_device (dev);		\
+	return sprintf (buf, format_string, mdev->ofdev.dev.of_node->field); \
+}
+
+static ssize_t modalias_show(struct device *dev, struct device_attribute *attr,
+			     char *buf)
+{
+	struct soundbus_dev *sdev = to_soundbus_device(dev);
+	struct platform_device *of = &sdev->ofdev;
+	int length;
+
+	if (*sdev->modalias) {
+		strlcpy(buf, sdev->modalias, sizeof(sdev->modalias) + 1);
+		strcat(buf, "\n");
+		length = strlen(buf);

for my curiosity:
why not sprintf() ? almost any other code seems to use sprintf().

I wouldn't be able to justify that as this is part is simply a copy 
paste from sysfs.c to core.c

Quentin

At Thu, 11 Jun 2015 14:04:45 +0200,
Quentin Lambert wrote:

On 11/06/2015 12:02, Takashi Iwai wrote:

quoted

At Thu, 11 Jun 2015 10:03:38 +0200,
Quentin Lambert wrote:

quoted

The dev_attrs field of struct bus_type is going away, use dev_groups instead.
This converts the soundbus code to use the correct field.

Given that all other usages of the macro define the struct attribute
*xxx_attrs[] in the same file they assign the .dev_groups field, this patch
merges sysfs.c into core.c.

These modifications were made using Coccinelle.

Signed-off-by: Quentin Lambert <redacted>
---
  Changes since v1:
   - Fix the commit message to actually talk about soundbus rather than MDIO
   - This version attempt to fix a problem resulting from the macro
     ATTRIBUTE_GROUPS declaring the structure as static by merging sysfs.c into
     core.c. I understand that this may not be the prefered solution since
     Takashi suggested that adding a comment line to the previous version could
     be acceptable.

Hmm, the patch doesn't look as mentioned here.
It's rather bigger than the previous patch.  Is this intentional?

Well as mentionned in the change log it is bigger because it moves the 
code from sysfs.c to
core.c. I realise as I am writing this that this patch should have 
really been two patches.
The first one removing sysfs.c and the second one removing the use of 
the dev_attrs.

Yes, that'd be better.  OTOH, do we really need to copy many codes at
all?  I really prefer shorter changes, if possible.


Takashi

On 11/06/2015 14:25, Takashi Iwai wrote:

At Thu, 11 Jun 2015 14:04:45 +0200,
Quentin Lambert wrote:

quoted

On 11/06/2015 12:02, Takashi Iwai wrote:

quoted

At Thu, 11 Jun 2015 10:03:38 +0200,
Quentin Lambert wrote:

quoted

The dev_attrs field of struct bus_type is going away, use dev_groups instead.
This converts the soundbus code to use the correct field.

Given that all other usages of the macro define the struct attribute
*xxx_attrs[] in the same file they assign the .dev_groups field, this patch
merges sysfs.c into core.c.

These modifications were made using Coccinelle.

Signed-off-by: Quentin Lambert <redacted>
---
   Changes since v1:
    - Fix the commit message to actually talk about soundbus rather than MDIO
    - This version attempt to fix a problem resulting from the macro
      ATTRIBUTE_GROUPS declaring the structure as static by merging sysfs.c into
      core.c. I understand that this may not be the prefered solution since
      Takashi suggested that adding a comment line to the previous version could
      be acceptable.

Hmm, the patch doesn't look as mentioned here.
It's rather bigger than the previous patch.  Is this intentional?

Well as mentionned in the change log it is bigger because it moves the
code from sysfs.c to
core.c. I realise as I am writing this that this patch should have
really been two patches.
The first one removing sysfs.c and the second one removing the use of
the dev_attrs.

Yes, that'd be better.  OTOH, do we really need to copy many codes at
all?  I really prefer shorter changes, if possible.

All right, I will send a third version following the comments you made 
on the fist version. I just wanted to propose this idea in case it 
suited you.

Quentin

The dev_attrs field of struct bus_type is going away, sue dev_groups instead.
This converts the soundbus code to use the correct field.

These modifications were made using Coccinelle.

Signed-off-by: Quentin Lambert <redacted>
---
 Changes since v2:
  - Revert to the version of the patch where the files weren't merge.
  - Add a comment line to explain where xxx_attrs is defined as suggested by
    Takashi. 
 sound/aoa/soundbus/core.c     |    4 +++-
 sound/aoa/soundbus/soundbus.h |    2 +-
 sound/aoa/soundbus/sysfs.c    |   13 ++++++++-----
 3 files changed, 12 insertions(+), 7 deletions(-)

--- a/sound/aoa/soundbus/core.c
+++ b/sound/aoa/soundbus/core.c

@@ -150,6 +150,8 @@ static int soundbus_device_resume(struct
 
 #endif /* CONFIG_PM */
 
+/* soundbus_dev_attrs is declared in sysfs.c */
+ATTRIBUTE_GROUPS(soundbus_dev);
 static struct bus_type soundbus_bus_type = {
 	.name		= "aoa-soundbus",
 	.probe		= soundbus_probe,

@@ -160,7 +162,7 @@ static struct bus_type soundbus_bus_type
 	.suspend	= soundbus_device_suspend,
 	.resume		= soundbus_device_resume,
 #endif
-	.dev_attrs	= soundbus_dev_attrs,
+	.dev_groups	= soundbus_dev_groups,
 };
 
 int soundbus_add_one(struct soundbus_dev *dev)
--- a/sound/aoa/soundbus/soundbus.h
+++ b/sound/aoa/soundbus/soundbus.h

@@ -199,6 +199,6 @@ struct soundbus_driver {
 extern int soundbus_register_driver(struct soundbus_driver *drv);
 extern void soundbus_unregister_driver(struct soundbus_driver *drv);
 
-extern struct device_attribute soundbus_dev_attrs[];
+extern struct attribute *soundbus_dev_attrs[];
 
 #endif /* __SOUNDBUS_H */
--- a/sound/aoa/soundbus/sysfs.c
+++ b/sound/aoa/soundbus/sysfs.c

@@ -30,13 +30,16 @@ static ssize_t modalias_show(struct devi
 
 	return length;
 }
+static DEVICE_ATTR_RO(modalias);
 
 soundbus_config_of_attr (name, "%s\n");
+static DEVICE_ATTR_RO(name);
 soundbus_config_of_attr (type, "%s\n");
+static DEVICE_ATTR_RO(type);
 
-struct device_attribute soundbus_dev_attrs[] = {
-	__ATTR_RO(name),
-	__ATTR_RO(type),
-	__ATTR_RO(modalias),
-	__ATTR_NULL
+struct attribute *soundbus_dev_attrs[] = {
+	&dev_attr_name.attr,
+	&dev_attr_type.attr,
+	&dev_attr_modalias.attr,
+	NULL,
 };