From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Paul Mackerras <paulus@samba.org>,
Michael Ellerman <mpe@ellerman.id.au>,
Bart Van Assche <bart.vanassche@sandisk.com>,
Johan Hovold <johan@kernel.org>,
Robin Murphy <robin.murphy@arm.com>,
Rob Herring <robh@kernel.org>,
Lars-Peter Clausen <lars@metafoo.de>,
linuxppc-dev@lists.ozlabs.org
Subject: [PATCH 09/16] powerpc: ibmebus: use dev_groups and not dev_attrs for bus_type
Date: Tue, 6 Jun 2017 21:22:14 +0200 [thread overview]
Message-ID: <20170606192221.1617-10-gregkh@linuxfoundation.org> (raw)
In-Reply-To: <20170606192221.1617-1-gregkh@linuxfoundation.org>
The dev_attrs field has long been "depreciated" and is finally being
removed, so move the driver to use the "correct" dev_groups field
instead for struct bus_type.
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Bart Van Assche <bart.vanassche@sandisk.com>
Cc: Johan Hovold <johan@kernel.org>
Cc: Robin Murphy <robin.murphy@arm.com>
Cc: Rob Herring <robh@kernel.org>
Cc: Lars-Peter Clausen <lars@metafoo.de>
Cc: <linuxppc-dev@lists.ozlabs.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
arch/powerpc/platforms/pseries/ibmebus.c | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/arch/powerpc/platforms/pseries/ibmebus.c b/arch/powerpc/platforms/pseries/ibmebus.c
index b363e439ddb9..52146b1356d2 100644
--- a/arch/powerpc/platforms/pseries/ibmebus.c
+++ b/arch/powerpc/platforms/pseries/ibmebus.c
@@ -397,6 +397,7 @@ static ssize_t devspec_show(struct device *dev,
ofdev = to_platform_device(dev);
return sprintf(buf, "%s\n", ofdev->dev.of_node->full_name);
}
+static DEVICE_ATTR_RO(devspec);
static ssize_t name_show(struct device *dev,
struct device_attribute *attr, char *buf)
@@ -406,19 +407,22 @@ static ssize_t name_show(struct device *dev,
ofdev = to_platform_device(dev);
return sprintf(buf, "%s\n", ofdev->dev.of_node->name);
}
+static DEVICE_ATTR_RO(name);
static ssize_t modalias_show(struct device *dev,
struct device_attribute *attr, char *buf)
{
return of_device_modalias(dev, buf, PAGE_SIZE);
}
+static DEVICE_ATTR_RO(modalias);
-static struct device_attribute ibmebus_bus_device_attrs[] = {
- __ATTR_RO(devspec),
- __ATTR_RO(name),
- __ATTR_RO(modalias),
- __ATTR_NULL
+static struct attribute *ibmebus_bus_device_attrs[] = {
+ &dev_attr_devspec.attr,
+ &dev_attr_name.attr,
+ &dev_attr_modalias.attr,
+ NULL,
};
+ATTRIBUTE_GROUPS(ibmebus_bus_device);
struct bus_type ibmebus_bus_type = {
.name = "ibmebus",
@@ -428,7 +432,7 @@ struct bus_type ibmebus_bus_type = {
.probe = ibmebus_bus_device_probe,
.remove = ibmebus_bus_device_remove,
.shutdown = ibmebus_bus_device_shutdown,
- .dev_attrs = ibmebus_bus_device_attrs,
+ .dev_groups = ibmebus_bus_device_groups,
};
EXPORT_SYMBOL(ibmebus_bus_type);
--
2.13.0
next prev parent reply other threads:[~2017-06-06 19:24 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-06 19:22 [PATCH 00/16] Driver core: remove bus_type.dev_attrs Greg Kroah-Hartman
2017-06-06 19:22 ` [PATCH 01/16] arm: ecard: use dev_groups and not dev_attrs for bus_type Greg Kroah-Hartman
2017-06-06 19:22 ` [PATCH 02/16] mips: sgi-ip22: " Greg Kroah-Hartman
2017-06-06 19:22 ` [PATCH 03/16] parisc: parisc_bus_type: " Greg Kroah-Hartman
2017-06-06 19:22 ` [PATCH 04/16] amba: " Greg Kroah-Hartman
2017-06-06 19:22 ` [PATCH 05/16] rpmsg: " Greg Kroah-Hartman
2017-06-06 19:33 ` Bjorn Andersson
2017-06-06 19:22 ` [PATCH 06/16] sh: superhyway: " Greg Kroah-Hartman
2017-06-06 19:22 ` [PATCH 07/16] macintosh: " Greg Kroah-Hartman
2017-06-06 19:22 ` [PATCH 08/16] powerpc: ps3: " Greg Kroah-Hartman
2017-06-06 21:33 ` Geoff Levand
2017-06-07 10:17 ` Greg Kroah-Hartman
2017-06-06 19:22 ` Greg Kroah-Hartman [this message]
2017-06-06 19:22 ` [PATCH 10/16] powerpc: vio: " Greg Kroah-Hartman
2017-06-06 19:30 ` Greg Kroah-Hartman
2017-06-06 23:04 ` Benjamin Herrenschmidt
2017-06-07 5:45 ` Greg Kroah-Hartman
2017-06-07 5:56 ` Benjamin Herrenschmidt
2017-06-07 8:58 ` [PATCH 10/16 v2] " Greg Kroah-Hartman
2017-06-06 19:22 ` [PATCH 11/16] powerpc: vio_cmo: " Greg Kroah-Hartman
2017-06-08 13:12 ` Michael Ellerman
2017-06-08 13:39 ` Greg Kroah-Hartman
2017-06-08 22:53 ` Michael Ellerman
2017-06-09 5:44 ` Greg Kroah-Hartman
2017-06-09 11:23 ` Michael Ellerman
2017-06-10 12:48 ` Greg Kroah-Hartman
2017-06-12 6:58 ` Greg Kroah-Hartman
2017-06-13 10:09 ` Michael Ellerman
2017-06-06 19:22 ` [PATCH 12/16] hwtracing: intel_th: " Greg Kroah-Hartman
2017-06-06 19:22 ` [PATCH 13/16] hid: intel-ish-hid: " Greg Kroah-Hartman
2017-06-06 22:33 ` Srinivas Pandruvada
2017-06-07 13:40 ` Jiri Kosina
2017-06-06 19:22 ` [PATCH 14/16] sparc: vio: " Greg Kroah-Hartman
2017-06-06 19:36 ` David Miller
2017-06-06 19:22 ` [PATCH 15/16] tty: serdev: " Greg Kroah-Hartman
2017-06-09 23:56 ` Stephen Rothwell
2017-06-10 0:01 ` Stephen Rothwell
2017-06-10 11:58 ` Greg Kroah-Hartman
2017-06-06 19:22 ` [PATCH 16/16] driver-core: remove struct bus_type.dev_attrs 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=20170606192221.1617-10-gregkh@linuxfoundation.org \
--to=gregkh@linuxfoundation.org \
--cc=bart.vanassche@sandisk.com \
--cc=benh@kernel.crashing.org \
--cc=johan@kernel.org \
--cc=lars@metafoo.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mpe@ellerman.id.au \
--cc=paulus@samba.org \
--cc=robh@kernel.org \
--cc=robin.murphy@arm.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).