diff options
| author | Mark Brown <broonie@kernel.org> | 2016-01-11 16:48:29 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-01-11 16:48:29 +0000 |
| commit | 174c21163d83f730f7e0194d4682d5149946a7f8 (patch) | |
| tree | 3c8e52335fef3668f3566cd3841e90cd625702ba /drivers/spi/spi.c | |
| parent | f30f072a5f3c0b2b5aa0ab8a6ed6482fdf581d17 (diff) | |
| parent | d1eba93bd0fcd3f699cb8d666bc97788ee85d557 (diff) | |
| download | blackbird-obmc-linux-174c21163d83f730f7e0194d4682d5149946a7f8.tar.gz blackbird-obmc-linux-174c21163d83f730f7e0194d4682d5149946a7f8.zip | |
Merge remote-tracking branch 'spi/topic/core' into spi-next
Diffstat (limited to 'drivers/spi/spi.c')
| -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, \ struct device_attribute *attr, \ char *buf) \ { \ - struct spi_device *spi = container_of(dev, \ - struct spi_device, dev); \ + struct spi_device *spi = to_spi_device(dev); \ return spi_statistics_##field##_show(&spi->statistics, buf); \ } \ static struct device_attribute dev_attr_spi_device_##field = { \ |
