openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Quentin Lambert <lambert.quentin@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Quentin Lambert 2015-06-12 10:38:41 +02:00 committed by Takashi Iwai
parent cc1b76ed32
commit a038b97951
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sound/aoa/soundbus/core.c
View File

@ -150,6 +150,8 @@ static int soundbus_device_resume(struct device * dev)
#endif /* CONFIG_PM */ #endif /* CONFIG_PM */
/* soundbus_dev_attrs is declared in sysfs.c */
ATTRIBUTE_GROUPS(soundbus_dev);
static struct bus_type soundbus_bus_type = { static struct bus_type soundbus_bus_type = {
.name = "aoa-soundbus", .name = "aoa-soundbus",
.probe = soundbus_probe, .probe = soundbus_probe,
@ -160,7 +162,7 @@ static struct bus_type soundbus_bus_type = {
.suspend = soundbus_device_suspend, .suspend = soundbus_device_suspend,
.resume = soundbus_device_resume, .resume = soundbus_device_resume,
#endif #endif
.dev_attrs = soundbus_dev_attrs, .dev_groups = soundbus_dev_groups,
}; };
int soundbus_add_one(struct soundbus_dev *dev) int soundbus_add_one(struct soundbus_dev *dev)

2
sound/aoa/soundbus/soundbus.h
View File

@ -199,6 +199,6 @@ struct soundbus_driver {
extern int soundbus_register_driver(struct soundbus_driver *drv); extern int soundbus_register_driver(struct soundbus_driver *drv);
extern void soundbus_unregister_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 */ #endif /* __SOUNDBUS_H */

13
sound/aoa/soundbus/sysfs.c
View File

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