summaryrefslogtreecommitdiffstats
path: root/drivers/spi
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2017-08-10 14:13:27 +0200
committerMark Brown <broonie@kernel.org>2017-08-10 16:50:23 +0200
commit88a19814de71aafe4de4868e1e13cd8b9a06a861 (patch)
tree3d173df487e1bc1f9b5d796dbc0fb765786a1d24 /drivers/spi
parentspi: qup: hide warning for uninitialized variable (diff)
downloadlinux-88a19814de71aafe4de4868e1e13cd8b9a06a861.tar.xz
linux-88a19814de71aafe4de4868e1e13cd8b9a06a861.zip
spi: qup: fix 64-bit build warning
On 64-bit systems, pointers are wider than 'int' variables, so we get a warning about a cast between them: drivers/spi/spi-qup.c:1060:23: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast] This changes the code to use the correct uintptr_t cast. Fixes: 4d023737b2ef ("spi: qup: Fix QUP version identify method") Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/spi')
-rw-r--r--drivers/spi/spi-qup.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi-qup.c b/drivers/spi/spi-qup.c
index e9ecd67cd817..974a8ce58b68 100644
--- a/drivers/spi/spi-qup.c
+++ b/drivers/spi/spi-qup.c
@@ -1057,7 +1057,7 @@ static int spi_qup_probe(struct platform_device *pdev)
else if (!ret)
master->can_dma = spi_qup_can_dma;
- controller->qup_v1 = (int)of_device_get_match_data(dev);
+ controller->qup_v1 = (uintptr_t)of_device_get_match_data(dev);
if (!controller->qup_v1)
master->set_cs = spi_qup_set_cs;