From: Quentin Lambert <lambert.quentin@gmail.com> To: Johannes Berg <johannes@sipsolutions.net>, Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.de>, linuxppc-dev@lists.ozlabs.org, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org Cc: kernel-janitors@vger.kernel.org, Quentin Lambert <lambert.quentin@gmail.com> Subject: [PATCH v3] ALSA: aoa: convert bus code to use dev_groups Date: Fri, 12 Jun 2015 10:38:41 +0200 [thread overview] Message-ID: <1434098322-12178-1-git-send-email-lambert.quentin@gmail.com> (raw) In-Reply-To: <1432817307-28380-1-git-send-email-lambert.quentin@gmail.com> 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 <lambert.quentin@gmail.com> --- 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, };
WARNING: multiple messages have this Message-ID (diff)
From: Quentin Lambert <lambert.quentin@gmail.com> To: Johannes Berg <johannes@sipsolutions.net>, Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.de>, linuxppc-dev@lists.ozlabs.org, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org Cc: kernel-janitors@vger.kernel.org, Quentin Lambert <lambert.quentin@gmail.com> Subject: [PATCH v3] ALSA: aoa: convert bus code to use dev_groups Date: Fri, 12 Jun 2015 08:38:41 +0000 [thread overview] Message-ID: <1434098322-12178-1-git-send-email-lambert.quentin@gmail.com> (raw) In-Reply-To: <1432817307-28380-1-git-send-email-lambert.quentin@gmail.com> 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 <lambert.quentin@gmail.com> --- 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, };
next prev parent reply other threads:[~2015-06-12 8:39 UTC|newest] Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-05-28 12:48 [PATCH] ALSA: aoa: convert bus code to use dev_groups Quentin Lambert 2015-05-28 12:48 ` Quentin Lambert 2015-05-28 13:52 ` Takashi Iwai 2015-05-28 13:52 ` Takashi Iwai 2015-05-28 13:59 ` Quentin Lambert 2015-05-28 13:59 ` Quentin Lambert 2015-05-28 14:09 ` Takashi Iwai 2015-05-28 14:09 ` Takashi Iwai 2015-05-28 14:43 ` Quentin Lambert 2015-05-28 14:43 ` Quentin Lambert 2015-05-28 15:01 ` Takashi Iwai 2015-05-28 15:01 ` Takashi Iwai 2015-05-29 15:49 ` Quentin Lambert 2015-05-29 15:49 ` Quentin Lambert 2015-05-29 15:53 ` Takashi Iwai 2015-05-29 15:53 ` Takashi Iwai 2015-05-28 13:59 ` Quentin Lambert 2015-05-28 13:59 ` Quentin Lambert 2015-06-11 8:03 ` [PATCH v2] " Quentin Lambert 2015-06-11 8:03 ` Quentin Lambert 2015-06-11 10:02 ` [alsa-devel] " Takashi Iwai 2015-06-11 10:02 ` Takashi Iwai 2015-06-11 12:04 ` Quentin Lambert 2015-06-11 12:04 ` Quentin Lambert 2015-06-11 12:25 ` Takashi Iwai 2015-06-11 12:25 ` Takashi Iwai 2015-06-11 12:25 ` [alsa-devel] " Takashi Iwai 2015-06-12 7:55 ` Quentin Lambert 2015-06-12 7:55 ` Quentin Lambert 2015-06-11 11:55 ` walter harms 2015-06-11 11:55 ` walter harms 2015-06-11 12:06 ` Quentin Lambert 2015-06-11 12:06 ` Quentin Lambert 2015-06-12 8:38 ` Quentin Lambert [this message] 2015-06-12 8:38 ` [PATCH v3] " Quentin Lambert 2015-06-12 9:59 ` Andreas Schwab 2015-06-12 9:59 ` Andreas Schwab 2015-06-12 10:01 ` Quentin Lambert 2015-06-12 10:01 ` Quentin Lambert 2015-06-12 18:50 ` Takashi Iwai 2015-06-12 18:50 ` Takashi Iwai
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1434098322-12178-1-git-send-email-lambert.quentin@gmail.com \ --to=lambert.quentin@gmail.com \ --cc=alsa-devel@alsa-project.org \ --cc=johannes@sipsolutions.net \ --cc=kernel-janitors@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linuxppc-dev@lists.ozlabs.org \ --cc=perex@perex.cz \ --cc=tiwai@suse.de \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.