diff options
| author | Andre Przywara <andre.przywara@arm.com> | 2015-02-23 12:30:46 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-02-24 10:37:39 +0900 |
| commit | 0744ea2a01cb75a750e8594b046102fc68fa45b3 (patch) | |
| tree | 82ad03e3f8be04c71d562b8da7bb527f22c7ea9c /drivers/spi/spi-s3c64xx.c | |
| parent | c517d838eb7d07bbe9507871fab3931deccff539 (diff) | |
| download | linux-0744ea2a01cb75a750e8594b046102fc68fa45b3.tar.gz linux-0744ea2a01cb75a750e8594b046102fc68fa45b3.tar.bz2 linux-0744ea2a01cb75a750e8594b046102fc68fa45b3.zip | |
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/spi/spi-s3c64xx.c')
| -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) /* Acquire DMA channels */ sdd->rx_dma.ch = dma_request_slave_channel_compat(mask, filter, - (void *)sdd->rx_dma.dmach, dev, "rx"); + (void *)(long)sdd->rx_dma.dmach, dev, "rx"); if (!sdd->rx_dma.ch) { dev_err(dev, "Failed to get RX DMA channel\n"); ret = -EBUSY; @@ -333,7 +333,7 @@ static int s3c64xx_spi_prepare_transfer(struct spi_master *spi) spi->dma_rx = sdd->rx_dma.ch; sdd->tx_dma.ch = dma_request_slave_channel_compat(mask, filter, - (void *)sdd->tx_dma.dmach, dev, "tx"); + (void *)(long)sdd->tx_dma.dmach, dev, "tx"); if (!sdd->tx_dma.ch) { dev_err(dev, "Failed to get TX DMA channel\n"); ret = -EBUSY; |