[PATCH] spi/xilinx: Cast ioread32/iowrite32 function pointers
Ricardo Ribalda Delgado
ricardo.ribalda at gmail.com
Thu Jan 29 06:51:13 PST 2015
IO functions prototypes may have different argument qualifiers
on different architectures.
This patch cast the assignment of the function, to match the one defined
at iomap.h.
Fixes: 99082eab63449f9d spi/xilinx: Remove iowrite/ioread wrappers
Reported-by: kbuild test robot <fengguang.wu at intel.com>
Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda at gmail.com>
---
drivers/spi/spi-xilinx.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/spi/spi-xilinx.c b/drivers/spi/spi-xilinx.c
index 0e8962c..418e730 100644
--- a/drivers/spi/spi-xilinx.c
+++ b/drivers/spi/spi-xilinx.c
@@ -91,7 +91,7 @@ struct xilinx_spi {
u8 bytes_per_word;
int buffer_size; /* buffer size in words */
u32 cs_inactive; /* Level of the CS pins when inactive*/
- unsigned int (*read_fn)(void __iomem *);
+ u32 (*read_fn)(void __iomem *);
void (*write_fn)(u32, void __iomem *);
};
@@ -378,15 +378,15 @@ static int xilinx_spi_probe(struct platform_device *pdev)
* Setup little endian helper functions first and try to use them
* and check if bit was correctly setup or not.
*/
- xspi->read_fn = ioread32;
- xspi->write_fn = iowrite32;
+ xspi->read_fn = (u32 (*)(void __iomem *)) ioread32;
+ xspi->write_fn = (void (*)(u32, void __iomem *)) iowrite32;
xspi->write_fn(XSPI_CR_LOOP, xspi->regs + XSPI_CR_OFFSET);
tmp = xspi->read_fn(xspi->regs + XSPI_CR_OFFSET);
tmp &= XSPI_CR_LOOP;
if (tmp != XSPI_CR_LOOP) {
- xspi->read_fn = ioread32be;
- xspi->write_fn = iowrite32be;
+ xspi->read_fn = (u32 (*)(void __iomem *)) ioread32be;
+ xspi->write_fn = (void (*)(u32, void __iomem *)) iowrite32be;
}
master->bits_per_word_mask = SPI_BPW_MASK(bits_per_word);
--
2.1.4
More information about the linux-arm-kernel
mailing list