summaryrefslogtreecommitdiffstats
path: root/drivers/spi
diff options
context:
space:
mode:
authorJarkko Nikula <jarkko.nikula@linux.intel.com>2014-12-18 14:04:22 +0100
committerMark Brown <broonie@kernel.org>2014-12-22 21:17:23 +0100
commit8e8dd9fb25f6dab6ac3f19f445a51b2c71e08d5c (patch)
treecc8c3af468ac2f1284bc799172798bdd523b5591 /drivers/spi
parentspi: pxa2xx: Add definition for Intel Quark DDS_RATE register (diff)
downloadlinux-8e8dd9fb25f6dab6ac3f19f445a51b2c71e08d5c.tar.xz
linux-8e8dd9fb25f6dab6ac3f19f445a51b2c71e08d5c.zip
spi: pxa2xx: Pass driver data instead of ioaddr to wait_ssp_rx_stall()
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>
Diffstat (limited to 'drivers/spi')
-rw-r--r--drivers/spi/spi-pxa2xx-pxadma.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/spi/spi-pxa2xx-pxadma.c b/drivers/spi/spi-pxa2xx-pxadma.c
index e8a26f25d5c0..aaa5fc6b465e 100644
--- a/drivers/spi/spi-pxa2xx-pxadma.c
+++ b/drivers/spi/spi-pxa2xx-pxadma.c
@@ -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");