diff options
| author |   Jarkko Nikula <jarkko.nikula@linux.intel.com> | 2016-09-07 17:04:07 +0300 |
|---|---|---|
| committer |   Mark Brown <broonie@kernel.org> | 2016-09-12 20:01:27 +0100 |
| commit | 96579a4e56bdecfb4642cfb68eb85d079acb9d28 (patch) | |
| tree | 58bf110c7cf0f071b12901a3b8c1ade00594712f /drivers/spi/spi-pxa2xx-dma.c | |
| parent | spi: pxa2xx: Remove pointer to current SPI message from driver data (diff) | |
| download | linux-dev-96579a4e56bdecfb4642cfb68eb85d079acb9d28.tar.xz linux-dev-96579a4e56bdecfb4642cfb68eb85d079acb9d28.zip | |
spi: pxa2xx: Remove pointer to chip data from driver data
Transfer state machine in this driver does not need to set/unset pointer
to chip data between queueing and finalizing message as it is not
actually used as a state info itself but just pointer passing.
Since this per SPI device specific chip data is already carried in
ctldata use that and remove pointer to chip data from driver data.
While at it, group initialized variables before uninitialized variables
in pump_transfers().
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 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/spi/spi-pxa2xx-dma.c b/drivers/spi/spi-pxa2xx-dma.c index 38efac33da47..04f3eecf5cf3 100644 --- a/drivers/spi/spi-pxa2xx-dma.c +++ b/drivers/spi/spi-pxa2xx-dma.c @@ -76,7 +76,8 @@ static struct dma_async_tx_descriptor * pxa2xx_spi_dma_prepare_one(struct driver_data *drv_data, enum dma_transfer_direction dir) { - struct chip_data *chip = drv_data->cur_chip; + struct chip_data *chip = + spi_get_ctldata(drv_data->master->cur_msg->spi); struct spi_transfer *xfer = drv_data->cur_transfer; enum dma_slave_buswidth width; struct dma_slave_config cfg; |