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

Commit Message

Quentin Lambert June 12, 2015, 8:38 a.m. UTC

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 <[e-mail]>
---
 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(-)

Comments

Andreas Schwab June 12, 2015, 9:59 a.m. UTC | #1

Quentin Lambert <[e-mail]> writes:

> The dev_attrs field of struct bus_type is going away, sue dev_groups instead.

s/sue/use/

Andreas.

Quentin Lambert June 12, 2015, 10:01 a.m. UTC | #2

On 12/06/2015 11:59, Andreas Schwab wrote:
> Quentin Lambert <[e-mail]> writes:
>
>> The dev_attrs field of struct bus_type is going away, sue dev_groups instead.
> s/sue/use/
I meant use do you need to fix something else or should I resend with 
the typo correction ?

Quentin

Takashi Iwai June 12, 2015, 6:50 p.m. UTC | #3

At Fri, 12 Jun 2015 12:01:42 +0200,
Quentin Lambert wrote:
> 
> 
> 
> On 12/06/2015 11:59, Andreas Schwab wrote:
> > Quentin Lambert <[e-mail]> writes:
> >
> >> The dev_attrs field of struct bus_type is going away, sue dev_groups instead.
> > s/sue/use/
> I meant use do you need to fix something else or should I resend with 
> the typo correction ?

I applied the corrected patch, so that you won't need to start lawsuit
:)

thanks,


Takashi

Patch

--- 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,
 };