Merge remote-tracking branch 'spi/topic/pl022' into spi-next

[firefly-linux-kernel-4.4.55.git] / drivers / spi / spi-s3c64xx.c

diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c
index eb53df27e7ea81af4eefa2912da48565724d6aaa..2465d6d35b068fa5158073a515ca562973ffc239 100644 (file)
--- a/drivers/spi/spi-s3c64xx.c
+++ b/drivers/spi/spi-s3c64xx.c
@@ -434,6 +434,9 @@ static int s3c64xx_spi_prepare_transfer(struct spi_master *spi)
        dma_cap_mask_t mask;
        int ret;
 
+       if (is_polling(sdd))
+               return 0;
+
        dma_cap_zero(mask);
        dma_cap_set(DMA_SLAVE, mask);
 
@@ -1272,7 +1275,7 @@ static struct s3c64xx_spi_info *s3c64xx_spi_parse_dt(struct device *dev)
 #else
 static struct s3c64xx_spi_info *s3c64xx_spi_parse_dt(struct device *dev)
 {
-       return dev->platform_data;
+       return dev_get_platdata(dev);
 }
 #endif
 
@@ -1297,7 +1300,7 @@ static int s3c64xx_spi_probe(struct platform_device *pdev)
        struct resource *mem_res;
        struct resource *res;
        struct s3c64xx_spi_driver_data *sdd;
-       struct s3c64xx_spi_info *sci = pdev->dev.platform_data;
+       struct s3c64xx_spi_info *sci = dev_get_platdata(&pdev->dev);
        struct spi_master *master;
        int ret, irq;
        char clk_name[16];