spi: uniphier: Fix a bug that doesn't point to private data correctly

In uniphier_spi_remove(), there is a wrong code to get private data from
the platform device, so the driver can't be removed properly.

The driver should get spi_master from the platform device and retrieve
the private data from it.

Cc: <[email protected]>
Fixes: 5ba155a4d4cc ("spi: add SPI controller driver for UniPhier SoC")
Signed-off-by: Kunihiko Hayashi <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Mark Brown <[email protected]>

diff --git a/drivers/spi/spi-uniphier.c b/drivers/spi/spi-uniphier.c
index 8900e51e1a1ccb888600506dbc2b6b812944fd1d..342ee8d2c47615060c98b83dae0adf8a27646898 100644 (file)
--- a/drivers/spi/spi-uniphier.c
+++ b/drivers/spi/spi-uniphier.c
@@ -767,12 +767,13 @@ out_master_put:
 
 static int uniphier_spi_remove(struct platform_device *pdev)
 {
-       struct uniphier_spi_priv *priv = platform_get_drvdata(pdev);
+       struct spi_master *master = platform_get_drvdata(pdev);
+       struct uniphier_spi_priv *priv = spi_master_get_devdata(master);
 
-       if (priv->master->dma_tx)
-               dma_release_channel(priv->master->dma_tx);
-       if (priv->master->dma_rx)
-               dma_release_channel(priv->master->dma_rx);
+       if (master->dma_tx)
+               dma_release_channel(master->dma_tx);
+       if (master->dma_rx)
+               dma_release_channel(master->dma_rx);
 
        clk_disable_unprepare(priv->clk);