linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Alex Dubov <oakad@yahoo.com>, Arnd Bergmann <arnd@arndb.de>
Subject: [PATCH 6/8] tifm: convert bus code to use dev_groups
Date: Mon,  7 Oct 2013 18:27:40 -0700	[thread overview]
Message-ID: <1381195662-28009-7-git-send-email-gregkh@linuxfoundation.org> (raw)
In-Reply-To: <1381195662-28009-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 tifm bus code to use the
correct field.

Cc: Alex Dubov <oakad@yahoo.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

Alex, I can take this through my driver-core tree if you don't want to
take it through yours, just let me know what works best for you.

 drivers/misc/tifm_core.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/drivers/misc/tifm_core.c b/drivers/misc/tifm_core.c
index 0ab7c92..a511b2a 100644
--- a/drivers/misc/tifm_core.c
+++ b/drivers/misc/tifm_core.c
@@ -145,15 +145,17 @@ static ssize_t type_show(struct device *dev, struct device_attribute *attr,
 	struct tifm_dev *sock = container_of(dev, struct tifm_dev, dev);
 	return sprintf(buf, "%x", sock->type);
 }
+static DEVICE_ATTR_RO(type);
 
-static struct device_attribute tifm_dev_attrs[] = {
-	__ATTR(type, S_IRUGO, type_show, NULL),
-	__ATTR_NULL
+static struct attribute *tifm_dev_attrs[] = {
+	&dev_attr_type.attr,
+	NULL,
 };
+ATTRIBUTE_GROUPS(tifm_dev);
 
 static struct bus_type tifm_bus_type = {
 	.name      = "tifm",
-	.dev_attrs = tifm_dev_attrs,
+	.dev_groups = tifm_dev_groups,
 	.match     = tifm_bus_match,
 	.uevent    = tifm_uevent,
 	.probe     = tifm_device_probe,
-- 
1.8.4.6.g82e253f.dirty


  parent reply	other threads:[~2013-10-08  2:16 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-10-08  1:27 [PATCH 0/8] driver core bus cleanup to use dev_groups, round 2 Greg Kroah-Hartman
2013-10-08  1:27 ` [PATCH 1/8] ide: convert bus code to use dev_groups Greg Kroah-Hartman
2013-10-08  5:00   ` David Miller
2013-10-08  1:27 ` [PATCH 2/8] ipack: " Greg Kroah-Hartman
2013-10-08  6:26   ` Samuel Iglesias Gonsálvez
2013-10-08  1:27 ` [PATCH 3/8] input: gameport: " Greg Kroah-Hartman
2013-10-08  1:27 ` [PATCH 4/8] spi: " Greg Kroah-Hartman
2013-10-08  9:35   ` Mark Brown
2013-10-08  1:27 ` [PATCH 5/8] virtio: " Greg Kroah-Hartman
2013-10-08  1:27 ` Greg Kroah-Hartman [this message]
2013-10-08  1:27 ` [PATCH 7/8] memstick: " Greg Kroah-Hartman
2013-10-08  1:27 ` [PATCH 8/8] i2o: " Greg Kroah-Hartman

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=1381195662-28009-7-git-send-email-gregkh@linuxfoundation.org \
    --to=gregkh@linuxfoundation.org \
    --cc=arnd@arndb.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=oakad@yahoo.com \
    /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).