diff options
| author |   Jarkko Nikula <jarkko.nikula@linux.intel.com> | 2018-02-01 17:17:30 +0200 |
|---|---|---|
| committer |   Mark Brown <broonie@kernel.org> | 2018-02-12 12:04:24 +0000 |
| commit | 3cc7b0e35745ae4e153f174038df34a79a385b32 (patch) | |
| tree | b7ede3d1b917adca6568b7969ba12e8072c77e4f /drivers/spi/spi-pxa2xx-dma.c | |
| parent | spi: pxa2xx: Move SSP idle waiting to cs_deassert() (diff) | |
| download | linux-dev-3cc7b0e35745ae4e153f174038df34a79a385b32.tar.xz linux-dev-3cc7b0e35745ae4e153f174038df34a79a385b32.zip | |
spi: pxa2xx: Convert to generalized SPI controller API
Convert to generalized SPI controller API introduced by the
commit 8caab75fd2c2 ("spi: Generalize SPI "master" to "controller"").
Inside driver variable name "master" is still used to indicate the driver
is master only.
While at it, change "unsigned cs" to "unsigned int cs" in
pxa2xx_spi_fw_translate_cs() to suppress checkpatch warning.
Signed-off-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/spi/spi-pxa2xx-dma.c')
| -rw-r--r-- | drivers/spi/spi-pxa2xx-dma.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/spi/spi-pxa2xx-dma.c b/drivers/spi/spi-pxa2xx-dma.c index 04f3eecf5cf3..3d7f66080c57 100644 --- a/drivers/spi/spi-pxa2xx-dma.c +++ b/drivers/spi/spi-pxa2xx-dma.c @@ -191,7 +191,7 @@ int pxa2xx_spi_dma_setup(struct driver_data *drv_data) { struct pxa2xx_spi_master *pdata = drv_data->master_info; struct device *dev = &drv_data->pdev->dev; - struct spi_master *master = drv_data->master; + struct spi_controller *master = drv_data->master; dma_cap_mask_t mask; dma_cap_zero(mask); @@ -215,7 +215,7 @@ int pxa2xx_spi_dma_setup(struct driver_data *drv_data) void pxa2xx_spi_dma_release(struct driver_data *drv_data) { - struct spi_master *master = drv_data->master; + struct spi_controller *master = drv_data->master; if (master->dma_rx) { dmaengine_terminate_sync(master->dma_rx); |