From: Boris Ostrovsky <boris.ostrovsky@oracle.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: linux-kernel@vger.kernel.org,
Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>,
David Vrabel <david.vrabel@citrix.com>,
xen-devel@lists.xenproject.org
Subject: Re: [PATCH 10/11] xenbus: convert bus code to use dev_groups
Date: Mon, 07 Oct 2013 12:34:06 -0400 [thread overview]
Message-ID: <5252E27E.1060004@oracle.com> (raw)
In-Reply-To: <1381128950-28125-11-git-send-email-gregkh@linuxfoundation.org>
On 10/07/2013 02:55 AM, Greg Kroah-Hartman wrote:
> The dev_attrs field of struct bus_type is going away soon, dev_groups
> should be used instead. This converts the xenbus code to use the
> correct field.
>
> Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
> Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com>
> Cc: David Vrabel <david.vrabel@citrix.com>
> Cc: <xen-devel@lists.xenproject.org>
> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> ---
>
> Konrad, I can take this through my driver-core tree if you like, just
> let me know what would be the easiest for you.
Konrad is likely out this (and possibly next) week but given that you
are taking a bunch of these patches it make sense that you take this one
as well.
(and just in case I gave it a quick test and it looked good).
-boris
>
> drivers/xen/xenbus/xenbus_probe.c | 24 ++++++++++++++++++------
> drivers/xen/xenbus/xenbus_probe.h | 2 +-
> drivers/xen/xenbus/xenbus_probe_backend.c | 2 +-
> drivers/xen/xenbus/xenbus_probe_frontend.c | 2 +-
> 4 files changed, 21 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/xen/xenbus/xenbus_probe.c b/drivers/xen/xenbus/xenbus_probe.c
> index 38e92b7..3c0a74b 100644
> --- a/drivers/xen/xenbus/xenbus_probe.c
> +++ b/drivers/xen/xenbus/xenbus_probe.c
> @@ -384,12 +384,14 @@ static ssize_t nodename_show(struct device *dev,
> {
> return sprintf(buf, "%s\n", to_xenbus_device(dev)->nodename);
> }
> +static DEVICE_ATTR_RO(nodename);
>
> static ssize_t devtype_show(struct device *dev,
> struct device_attribute *attr, char *buf)
> {
> return sprintf(buf, "%s\n", to_xenbus_device(dev)->devicetype);
> }
> +static DEVICE_ATTR_RO(devtype);
>
> static ssize_t modalias_show(struct device *dev,
> struct device_attribute *attr, char *buf)
> @@ -397,14 +399,24 @@ static ssize_t modalias_show(struct device *dev,
> return sprintf(buf, "%s:%s\n", dev->bus->name,
> to_xenbus_device(dev)->devicetype);
> }
> +static DEVICE_ATTR_RO(modalias);
>
> -struct device_attribute xenbus_dev_attrs[] = {
> - __ATTR_RO(nodename),
> - __ATTR_RO(devtype),
> - __ATTR_RO(modalias),
> - __ATTR_NULL
> +static struct attribute *xenbus_dev_attrs[] = {
> + &dev_attr_nodename.attr,
> + &dev_attr_devtype.attr,
> + &dev_attr_modalias.attr,
> + NULL,
> };
> -EXPORT_SYMBOL_GPL(xenbus_dev_attrs);
> +
> +static const struct attribute_group xenbus_dev_group = {
> + .attrs = xenbus_dev_attrs,
> +};
> +
> +const struct attribute_group *xenbus_dev_groups[] = {
> + &xenbus_dev_group,
> + NULL,
> +};
> +EXPORT_SYMBOL_GPL(xenbus_dev_groups);
>
> int xenbus_probe_node(struct xen_bus_type *bus,
> const char *type,
> diff --git a/drivers/xen/xenbus/xenbus_probe.h b/drivers/xen/xenbus/xenbus_probe.h
> index 146f857..1085ec2 100644
> --- a/drivers/xen/xenbus/xenbus_probe.h
> +++ b/drivers/xen/xenbus/xenbus_probe.h
> @@ -54,7 +54,7 @@ enum xenstore_init {
> XS_LOCAL,
> };
>
> -extern struct device_attribute xenbus_dev_attrs[];
> +extern const struct attribute_group *xenbus_dev_groups[];
>
> extern int xenbus_match(struct device *_dev, struct device_driver *_drv);
> extern int xenbus_dev_probe(struct device *_dev);
> diff --git a/drivers/xen/xenbus/xenbus_probe_backend.c b/drivers/xen/xenbus/xenbus_probe_backend.c
> index 998bbba..5125dce 100644
> --- a/drivers/xen/xenbus/xenbus_probe_backend.c
> +++ b/drivers/xen/xenbus/xenbus_probe_backend.c
> @@ -200,7 +200,7 @@ static struct xen_bus_type xenbus_backend = {
> .probe = xenbus_dev_probe,
> .remove = xenbus_dev_remove,
> .shutdown = xenbus_dev_shutdown,
> - .dev_attrs = xenbus_dev_attrs,
> + .dev_groups = xenbus_dev_groups,
> },
> };
>
> diff --git a/drivers/xen/xenbus/xenbus_probe_frontend.c b/drivers/xen/xenbus/xenbus_probe_frontend.c
> index 34b20bf..129bf84 100644
> --- a/drivers/xen/xenbus/xenbus_probe_frontend.c
> +++ b/drivers/xen/xenbus/xenbus_probe_frontend.c
> @@ -154,7 +154,7 @@ static struct xen_bus_type xenbus_frontend = {
> .probe = xenbus_frontend_dev_probe,
> .remove = xenbus_dev_remove,
> .shutdown = xenbus_dev_shutdown,
> - .dev_attrs = xenbus_dev_attrs,
> + .dev_groups = xenbus_dev_groups,
>
> .pm = &xenbus_pm_ops,
> },
next prev parent reply other threads:[~2013-10-07 16:31 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 [this message]
2013-10-07 6:55 ` [PATCH 11/11] hsi: " 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=5252E27E.1060004@oracle.com \
--to=boris.ostrovsky@oracle.com \
--cc=david.vrabel@citrix.com \
--cc=gregkh@linuxfoundation.org \
--cc=konrad.wilk@oracle.com \
--cc=linux-kernel@vger.kernel.org \
--cc=xen-devel@lists.xenproject.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).