Commit 02eb884f authored by Tolga Ceylan's avatar Tolga Ceylan Committed by Greg Kroah-Hartman

drivers: staging: fbtft: fbtft-bus.c: Fix different address space warning on I/O mem

To fix sparse warning of incorrect type in assignment
(different address space), added annotation __iomem to
vmem8 and modified direct reads with ioread8().
Signed-off-by: default avatarTolga Ceylan <tolga.ceylan@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent bae97e81
...@@ -184,7 +184,7 @@ EXPORT_SYMBOL(fbtft_write_vmem16_bus8); ...@@ -184,7 +184,7 @@ EXPORT_SYMBOL(fbtft_write_vmem16_bus8);
/* 16 bit pixel over 9-bit SPI bus: dc + high byte, dc + low byte */ /* 16 bit pixel over 9-bit SPI bus: dc + high byte, dc + low byte */
int fbtft_write_vmem16_bus9(struct fbtft_par *par, size_t offset, size_t len) int fbtft_write_vmem16_bus9(struct fbtft_par *par, size_t offset, size_t len)
{ {
u8 *vmem8; u8 __iomem *vmem8;
u16 *txbuf16 = par->txbuf.buf; u16 *txbuf16 = par->txbuf.buf;
size_t remain; size_t remain;
size_t to_copy; size_t to_copy;
...@@ -212,12 +212,12 @@ int fbtft_write_vmem16_bus9(struct fbtft_par *par, size_t offset, size_t len) ...@@ -212,12 +212,12 @@ int fbtft_write_vmem16_bus9(struct fbtft_par *par, size_t offset, size_t len)
#ifdef __LITTLE_ENDIAN #ifdef __LITTLE_ENDIAN
for (i = 0; i < to_copy; i += 2) { for (i = 0; i < to_copy; i += 2) {
txbuf16[i] = 0x0100 | vmem8[i+1]; txbuf16[i] = 0x0100 | ioread8(vmem8 + i + 1);
txbuf16[i+1] = 0x0100 | vmem8[i]; txbuf16[i + 1] = 0x0100 | ioread8(vmem8 + i);
} }
#else #else
for (i = 0; i < to_copy; i++) for (i = 0; i < to_copy; i++)
txbuf16[i] = 0x0100 | vmem8[i]; txbuf16[i] = 0x0100 | ioread8(vmem8 + i);
#endif #endif
vmem8 = vmem8 + to_copy; vmem8 = vmem8 + to_copy;
ret = par->fbtftops.write(par, par->txbuf.buf, to_copy*2); ret = par->fbtftops.write(par, par->txbuf.buf, to_copy*2);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment