[ Upstream commit e5c27498a0403b270620b1a8a0a66e3efc222fb6 ]

atmel_qspi objects are kept in spi_controller objects, so, first get
pointer to spi_controller object and then get atmel_qspi object from
spi_controller object.

Fixes: 2d30ac5ed633 ("mtd: spi-nor: atmel-quadspi: Use spi-mem interface for 
atmel-quadspi driver")
Signed-off-by: Claudiu Beznea <claudiu.bez...@microchip.com>
Reviewed-by: Tudor Ambarus <tudor.amba...@microchip.com>
Signed-off-by: Mark Brown <broo...@kernel.org>
Signed-off-by: Sasha Levin <sas...@kernel.org>
---
 drivers/spi/atmel-quadspi.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/spi/atmel-quadspi.c b/drivers/spi/atmel-quadspi.c
index fffc21cd5f793..b3173ebddaded 100644
--- a/drivers/spi/atmel-quadspi.c
+++ b/drivers/spi/atmel-quadspi.c
@@ -570,7 +570,8 @@ static int atmel_qspi_remove(struct platform_device *pdev)
 
 static int __maybe_unused atmel_qspi_suspend(struct device *dev)
 {
-       struct atmel_qspi *aq = dev_get_drvdata(dev);
+       struct spi_controller *ctrl = dev_get_drvdata(dev);
+       struct atmel_qspi *aq = spi_controller_get_devdata(ctrl);
 
        clk_disable_unprepare(aq->qspick);
        clk_disable_unprepare(aq->pclk);
@@ -580,7 +581,8 @@ static int __maybe_unused atmel_qspi_suspend(struct device 
*dev)
 
 static int __maybe_unused atmel_qspi_resume(struct device *dev)
 {
-       struct atmel_qspi *aq = dev_get_drvdata(dev);
+       struct spi_controller *ctrl = dev_get_drvdata(dev);
+       struct atmel_qspi *aq = spi_controller_get_devdata(ctrl);
 
        clk_prepare_enable(aq->pclk);
        clk_prepare_enable(aq->qspick);
-- 
2.20.1



Reply via email to