diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-10-05 23:10:14 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-10-05 23:10:14 -0700 |
| commit | 9e06a307a040bb17573afb2f48b6a7d26920394f (patch) | |
| tree | 222b8cbd15a432f906f01dcd21de484984a01bc4 /p13.patch | |
| parent | 439aaed86577bc756086c2193f8fa23ae48d6722 (diff) | |
| download | patches-9e06a307a040bb17573afb2f48b6a7d26920394f.tar.gz | |
new dev_attr bus removal patches added
Diffstat (limited to 'p13.patch')
| -rw-r--r-- | p13.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/p13.patch b/p13.patch new file mode 100644 index 00000000000000..50d4136058a5ba --- /dev/null +++ b/p13.patch @@ -0,0 +1,32 @@ +--- + 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, |