Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a038b979 authored by Quentin Lambert's avatar Quentin Lambert Committed by Takashi Iwai
Browse files

ALSA: aoa: convert bus code to use dev_groups 



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.

These modifications were made using Coccinelle.

Signed-off-by: default avatarQuentin Lambert <lambert.quentin@gmail.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent cc1b76ed

sound/aoa/soundbus/core.c

+3 −1
Original line number Diff line number Diff line
@@ -150,6 +150,8 @@ static int soundbus_device_resume(struct device * dev) 


#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)

sound/aoa/soundbus/soundbus.h

+1 −1
Original line number Diff line number Diff line
@@ -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 */

sound/aoa/soundbus/sysfs.c

+8 −5
Original line number Diff line number Diff line
@@ -30,13 +30,16 @@ static ssize_t modalias_show(struct device *dev, struct device_attribute *attr, 


	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,

};