Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aa7da564 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman Committed by Mark Brown
Browse files

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.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 89da4293

drivers/spi/spi.c

+6 −4
Original line number Diff line number Diff line
@@ -58,11 +58,13 @@ modalias_show(struct device *dev, struct device_attribute *a, char *buf) 


	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,