Skip to content

Commit

Permalink
spi: pxa2xx: Pass driver data instead of ioaddr to wait_ssp_rx_stall()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jarkko Nikula authored and Mark Brown committed Dec 22, 2014
1 parent c4827bb commit 8e8dd9f
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions drivers/spi/spi-pxa2xx-pxadma.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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");

Expand Down

0 comments on commit 8e8dd9f

Please sign in to comment.