diff options
| author | Andre Przywara <andre.przywara@arm.com> | 2015-02-23 07:30:46 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-02-23 20:37:39 -0500 |
| commit | 0744ea2a01cb75a750e8594b046102fc68fa45b3 (patch) | |
| tree | 82ad03e3f8be04c71d562b8da7bb527f22c7ea9c /drivers | |
| parent | c517d838eb7d07bbe9507871fab3931deccff539 (diff) | |
spi: s3c64xx: fix compiler warning in spi-s3c64xx
The Exynos 7 arm64 support now allows the S3C64xx SPI driver to be
compiled into an ARM64 kernel, so the cast from the [rt]x_dmach int
variable to a void* in this driver now triggers a warning.
Add a long cast to silence the compiler.
Signed-off-by: Andre Przywara <andre.przywara@arm.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/spi/spi-s3c64xx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c index 9231c34b5a5c..b1c6731fbf27 100644 --- a/drivers/spi/spi-s3c64xx.c +++ b/drivers/spi/spi-s3c64xx.c | |||
| @@ -324,7 +324,7 @@ static int s3c64xx_spi_prepare_transfer(struct spi_master *spi) | |||
| 324 | 324 | ||
| 325 | /* Acquire DMA channels */ | 325 | /* Acquire DMA channels */ |
| 326 | sdd->rx_dma.ch = dma_request_slave_channel_compat(mask, filter, | 326 | sdd->rx_dma.ch = dma_request_slave_channel_compat(mask, filter, |
| 327 | (void *)sdd->rx_dma.dmach, dev, "rx"); | 327 | (void *)(long)sdd->rx_dma.dmach, dev, "rx"); |
| 328 | if (!sdd->rx_dma.ch) { | 328 | if (!sdd->rx_dma.ch) { |
| 329 | dev_err(dev, "Failed to get RX DMA channel\n"); | 329 | dev_err(dev, "Failed to get RX DMA channel\n"); |
| 330 | ret = -EBUSY; | 330 | ret = -EBUSY; |
| @@ -333,7 +333,7 @@ static int s3c64xx_spi_prepare_transfer(struct spi_master *spi) | |||
| 333 | spi->dma_rx = sdd->rx_dma.ch; | 333 | spi->dma_rx = sdd->rx_dma.ch; |
| 334 | 334 | ||
| 335 | sdd->tx_dma.ch = dma_request_slave_channel_compat(mask, filter, | 335 | sdd->tx_dma.ch = dma_request_slave_channel_compat(mask, filter, |
| 336 | (void *)sdd->tx_dma.dmach, dev, "tx"); | 336 | (void *)(long)sdd->tx_dma.dmach, dev, "tx"); |
| 337 | if (!sdd->tx_dma.ch) { | 337 | if (!sdd->tx_dma.ch) { |
| 338 | dev_err(dev, "Failed to get TX DMA channel\n"); | 338 | dev_err(dev, "Failed to get TX DMA channel\n"); |
| 339 | ret = -EBUSY; | 339 | ret = -EBUSY; |
