From: ricardo.ribalda@gmail.com (Ricardo Ribalda Delgado)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] spi/xilinx: Cast ioread32/iowrite32 function pointers
Date: Thu, 29 Jan 2015 15:51:13 +0100 [thread overview]
Message-ID: <1422543073-21895-1-git-send-email-ricardo.ribalda@gmail.com> (raw)
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@intel.com>
Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@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
next reply other threads:[~2015-01-29 14:51 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-29 14:51 Ricardo Ribalda Delgado [this message]
2015-01-29 15:56 ` [PATCH] spi/xilinx: Cast ioread32/iowrite32 function pointers Geert Uytterhoeven
2015-01-29 16:39 ` Ricardo Ribalda Delgado
2015-01-29 22:11 ` Arnd Bergmann
2015-01-29 22:14 ` Ricardo Ribalda Delgado
2015-01-29 22:28 ` Arnd Bergmann
2015-01-29 16:04 ` Arnd Bergmann
2015-01-29 16:39 ` Ricardo Ribalda Delgado
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1422543073-21895-1-git-send-email-ricardo.ribalda@gmail.com \
--to=ricardo.ribalda@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox