diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-11-03 16:05:34 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-11-03 16:05:34 -0800 |
| commit | 52894f7f35f3c6ad2b3362f021cdee69797d7a79 (patch) | |
| tree | 798f5b8bfb2a5b23e49fb68002f660b694c4e672 /spi-convert-bus-code-to-use-dev_groups.patch | |
| parent | ad2f0a874ca11c77885ea119cc80fe40c7e29eb3 (diff) | |
| download | patches-52894f7f35f3c6ad2b3362f021cdee69797d7a79.tar.gz | |
renames and a new patch
Diffstat (limited to 'spi-convert-bus-code-to-use-dev_groups.patch')
| -rw-r--r-- | spi-convert-bus-code-to-use-dev_groups.patch | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/spi-convert-bus-code-to-use-dev_groups.patch b/spi-convert-bus-code-to-use-dev_groups.patch new file mode 100644 index 00000000000000..90e12654f8604a --- /dev/null +++ b/spi-convert-bus-code-to-use-dev_groups.patch @@ -0,0 +1,45 @@ +From foo@baz Mon Oct 7 18:11:02 PDT 2013 +Date: Mon, 07 Oct 2013 18:11:02 -0700 +To: Greg KH <gregkh@linuxfoundation.org> +From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Subject: spi: convert bus code to use dev_groups + +The dev_attrs field of struct bus_type is going away soon, dev_groups +should be used instead. This converts the spi bus code to use the +correct field. + +Cc: Mark Brown <broonie@kernel.org> +Cc: <linux-spi@vger.kernel.org> +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +--- + drivers/spi/spi.c | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +--- a/drivers/spi/spi.c ++++ b/drivers/spi/spi.c +@@ -58,11 +58,13 @@ modalias_show(struct device *dev, struct + + return sprintf(buf, "%s%s\n", SPI_MODULE_PREFIX, spi->modalias); + } ++static DEVICE_ATTR_RO(modalias); + +-static struct device_attribute spi_dev_attrs[] = { +- __ATTR_RO(modalias), +- __ATTR_NULL, ++static struct attribute *spi_dev_attrs[] = { ++ &dev_attr_modalias.attr, ++ NULL, + }; ++ATTRIBUTE_GROUPS(spi_dev); + + /* modalias support makes "modprobe $MODALIAS" new-style hotplug work, + * and the sysfs version makes coldplug work too. +@@ -229,7 +231,7 @@ static const struct dev_pm_ops spi_pm = + + struct bus_type spi_bus_type = { + .name = "spi", +- .dev_attrs = spi_dev_attrs, ++ .dev_groups = spi_dev_groups, + .match = spi_match_device, + .uevent = spi_uevent, + .pm = &spi_pm, |