]> git.proxmox.com Git - mirror_ubuntu-focal-kernel.git/commitdiff
spi: pxa2xx: Pass driver data instead of ioaddr to wait_ssp_rx_stall()
authorJarkko Nikula <jarkko.nikula@linux.intel.com>
Thu, 18 Dec 2014 13:04:22 +0000 (15:04 +0200)
committerMark Brown <broonie@kernel.org>
Mon, 22 Dec 2014 20:17:23 +0000 (20:17 +0000)
Pass pointer to struct driver_data instead of ioaddr to wait_ssp_rx_stall()
for preparing to register access macro cleanup.

Signed-off-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/spi/spi-pxa2xx-pxadma.c

index e8a26f25d5c0a1464ab259c545e2b1d2031a9741..aaa5fc6b465ea4787516a7d38d23eb923fb4b718 100644 (file)
@@ -118,11 +118,11 @@ static void pxa2xx_spi_unmap_dma_buffers(struct driver_data *drv_data)
        drv_data->dma_mapped = 0;
 }
 
-static int wait_ssp_rx_stall(void const __iomem *ioaddr)
+static int wait_ssp_rx_stall(struct driver_data *drv_data)
 {
        unsigned long limit = loops_per_jiffy << 1;
 
-       while ((read_SSSR(ioaddr) & SSSR_BSY) && --limit)
+       while ((read_SSSR(drv_data->ioaddr) & SSSR_BSY) && --limit)
                cpu_relax();
 
        return limit;
@@ -228,7 +228,7 @@ void pxa2xx_spi_dma_handler(int channel, void *data)
                && (drv_data->ssp_type == PXA25x_SSP)) {
 
                /* Wait for rx to stall */
-               if (wait_ssp_rx_stall(drv_data->ioaddr) == 0)
+               if (wait_ssp_rx_stall(drv_data) == 0)
                        dev_err(&drv_data->pdev->dev,
                                "dma_handler: ssp rx stall failed\n");