From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Andrew Morton <akpm@linux-foundation.org>,
Kees Cook <keescook@chromium.org>
Subject: [PATCH 11/11] hsi: convert bus code to use dev_groups
Date: Sun, 6 Oct 2013 23:55:50 -0700 [thread overview]
Message-ID: <1381128950-28125-12-git-send-email-gregkh@linuxfoundation.org> (raw)
In-Reply-To: <1381128950-28125-1-git-send-email-gregkh@linuxfoundation.org>
The dev_attrs field of struct bus_type is going away soon, dev_groups
should be used instead. This converts the hsi code to use the
correct field.
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Kees Cook <keescook@chromium.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
drivers/hsi/hsi.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/drivers/hsi/hsi.c b/drivers/hsi/hsi.c
index 66d4458..749f7b5 100644
--- a/drivers/hsi/hsi.c
+++ b/drivers/hsi/hsi.c
@@ -33,11 +33,13 @@ static ssize_t modalias_show(struct device *dev,
{
return sprintf(buf, "hsi:%s\n", dev_name(dev));
}
+static DEVICE_ATTR_RO(modalias);
-static struct device_attribute hsi_bus_dev_attrs[] = {
- __ATTR_RO(modalias),
- __ATTR_NULL,
+static struct attribute *hsi_bus_dev_attrs[] = {
+ &dev_attr_modalias.attr,
+ NULL,
};
+ATTRIBUTE_GROUPS(hsi_bus_dev);
static int hsi_bus_uevent(struct device *dev, struct kobj_uevent_env *env)
{
@@ -53,7 +55,7 @@ static int hsi_bus_match(struct device *dev, struct device_driver *driver)
static struct bus_type hsi_bus_type = {
.name = "hsi",
- .dev_attrs = hsi_bus_dev_attrs,
+ .dev_groups = hsi_bus_dev_groups,
.match = hsi_bus_match,
.uevent = hsi_bus_uevent,
};
--
1.8.4.6.g82e253f.dirty
prev parent reply other threads:[~2013-10-07 6:58 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-07 6:55 [PATCH 00/11] driver core bus cleanup to use dev_groups Greg Kroah-Hartman
2013-10-07 6:55 ` [PATCH 01/11] pci: convert bus code " Greg Kroah-Hartman
2013-10-07 18:21 ` Bjorn Helgaas
2013-10-07 20:41 ` Greg Kroah-Hartman
2013-10-07 20:47 ` Bjorn Helgaas
2013-10-07 21:18 ` Bjorn Helgaas
2013-10-07 6:55 ` [PATCH 02/11] mdio_bus: " Greg Kroah-Hartman
2013-10-07 6:55 ` [PATCH 03/11] PNP: " Greg Kroah-Hartman
2013-10-07 21:27 ` Rafael J. Wysocki
2013-10-07 6:55 ` [PATCH 04/11] MMC: " Greg Kroah-Hartman
2013-10-07 6:55 ` [PATCH 05/11] uwb: " Greg Kroah-Hartman
2013-10-07 6:55 ` [PATCH 06/11] bcma: " Greg Kroah-Hartman
2013-10-09 15:13 ` John W. Linville
2013-10-10 8:08 ` Rafał Miłecki
2013-10-07 6:55 ` [PATCH 07/11] pcmcia: " Greg Kroah-Hartman
2013-10-07 6:55 ` [PATCH 08/11] rapidio: " Greg Kroah-Hartman
2013-10-07 6:55 ` [PATCH 09/11] ssb: " Greg Kroah-Hartman
2013-10-07 6:55 ` [PATCH 10/11] xenbus: " Greg Kroah-Hartman
2013-10-07 16:34 ` Boris Ostrovsky
2013-10-07 6:55 ` Greg Kroah-Hartman [this message]
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=1381128950-28125-12-git-send-email-gregkh@linuxfoundation.org \
--to=gregkh@linuxfoundation.org \
--cc=akpm@linux-foundation.org \
--cc=keescook@chromium.org \
--cc=linux-kernel@vger.kernel.org \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).