diff options
author | Mark Brown | 2016-02-09 19:20:39 +0100 |
---|---|---|
committer | Mark Brown | 2016-02-09 19:20:39 +0100 |
commit | fcdcc79628a1919bde9acf239e364f65bab6327c (patch) | |
tree | 5499be387cf3028c90ac083b1cf866ebed7bf7e0 /drivers/spi/spi-zynqmp-gqspi.c | |
parent | spi: pxa2xx: Fix too early chipselect deassert (diff) | |
parent | spi: Let drivers translate ACPI DeviceSelection to suitable Linux chip select (diff) | |
download | kernel-qcow2-linux-fcdcc79628a1919bde9acf239e364f65bab6327c.tar.gz kernel-qcow2-linux-fcdcc79628a1919bde9acf239e364f65bab6327c.tar.xz kernel-qcow2-linux-fcdcc79628a1919bde9acf239e364f65bab6327c.zip |
Merge branch 'topic/acpi' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi into spi-pxa2xx
Diffstat (limited to 'drivers/spi/spi-zynqmp-gqspi.c')
-rw-r--r-- | drivers/spi/spi-zynqmp-gqspi.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/spi/spi-zynqmp-gqspi.c b/drivers/spi/spi-zynqmp-gqspi.c index f23f36ebaf3d..aab9b492c627 100644 --- a/drivers/spi/spi-zynqmp-gqspi.c +++ b/drivers/spi/spi-zynqmp-gqspi.c @@ -917,9 +917,7 @@ static int zynqmp_qspi_start_transfer(struct spi_master *master, */ static int __maybe_unused zynqmp_qspi_suspend(struct device *dev) { - struct platform_device *pdev = container_of(dev, - struct platform_device, - dev); + struct platform_device *pdev = to_platform_device(dev); struct spi_master *master = platform_get_drvdata(pdev); spi_master_suspend(master); @@ -940,9 +938,7 @@ static int __maybe_unused zynqmp_qspi_suspend(struct device *dev) */ static int __maybe_unused zynqmp_qspi_resume(struct device *dev) { - struct platform_device *pdev = container_of(dev, - struct platform_device, - dev); + struct platform_device *pdev = to_platform_device(dev); struct spi_master *master = platform_get_drvdata(pdev); struct zynqmp_qspi *xqspi = spi_master_get_devdata(master); int ret = 0; |