diff options
author | Jarkko Nikula <jarkko.nikula@linux.intel.com> | 2014-12-18 08:04:22 -0500 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2014-12-22 15:17:23 -0500 |
commit | 8e8dd9fb25f6dab6ac3f19f445a51b2c71e08d5c (patch) | |
tree | cc8c3af468ac2f1284bc799172798bdd523b5591 /drivers/spi | |
parent | c4827bb859cbe8afad9287c9dd4e7162119d3d59 (diff) |
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.c | 6 |
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) | |||
118 | drv_data->dma_mapped = 0; | 118 | drv_data->dma_mapped = 0; |
119 | } | 119 | } |
120 | 120 | ||
121 | static int wait_ssp_rx_stall(void const __iomem *ioaddr) | 121 | static int wait_ssp_rx_stall(struct driver_data *drv_data) |
122 | { | 122 | { |
123 | unsigned long limit = loops_per_jiffy << 1; | 123 | unsigned long limit = loops_per_jiffy << 1; |
124 | 124 | ||
125 | while ((read_SSSR(ioaddr) & SSSR_BSY) && --limit) | 125 | while ((read_SSSR(drv_data->ioaddr) & SSSR_BSY) && --limit) |
126 | cpu_relax(); | 126 | cpu_relax(); |
127 | 127 | ||
128 | return limit; | 128 | return limit; |
@@ -228,7 +228,7 @@ void pxa2xx_spi_dma_handler(int channel, void *data) | |||
228 | && (drv_data->ssp_type == PXA25x_SSP)) { | 228 | && (drv_data->ssp_type == PXA25x_SSP)) { |
229 | 229 | ||
230 | /* Wait for rx to stall */ | 230 | /* Wait for rx to stall */ |
231 | if (wait_ssp_rx_stall(drv_data->ioaddr) == 0) | 231 | if (wait_ssp_rx_stall(drv_data) == 0) |
232 | dev_err(&drv_data->pdev->dev, | 232 | dev_err(&drv_data->pdev->dev, |
233 | "dma_handler: ssp rx stall failed\n"); | 233 | "dma_handler: ssp rx stall failed\n"); |
234 | 234 | ||