diff options
author | Mark Brown <broonie@kernel.org> | 2016-01-11 11:48:29 -0500 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2016-01-11 11:48:29 -0500 |
commit | 174c21163d83f730f7e0194d4682d5149946a7f8 (patch) | |
tree | 3c8e52335fef3668f3566cd3841e90cd625702ba | |
parent | f30f072a5f3c0b2b5aa0ab8a6ed6482fdf581d17 (diff) | |
parent | d1eba93bd0fcd3f699cb8d666bc97788ee85d557 (diff) |
Merge remote-tracking branch 'spi/topic/core' into spi-next
-rw-r--r-- | drivers/spi/spi.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index dee1cb87d24f..a678a7f1a65d 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c | |||
@@ -84,8 +84,7 @@ static ssize_t spi_device_##field##_show(struct device *dev, \ | |||
84 | struct device_attribute *attr, \ | 84 | struct device_attribute *attr, \ |
85 | char *buf) \ | 85 | char *buf) \ |
86 | { \ | 86 | { \ |
87 | struct spi_device *spi = container_of(dev, \ | 87 | struct spi_device *spi = to_spi_device(dev); \ |
88 | struct spi_device, dev); \ | ||
89 | return spi_statistics_##field##_show(&spi->statistics, buf); \ | 88 | return spi_statistics_##field##_show(&spi->statistics, buf); \ |
90 | } \ | 89 | } \ |
91 | static struct device_attribute dev_attr_spi_device_##field = { \ | 90 | static struct device_attribute dev_attr_spi_device_##field = { \ |