sparse was complaning about an incorrect type cast:
drivers/staging/fbtft/fbtft-bus.c:60:1: warning: incorrect type in assignment
(different base types)
drivers/staging/fbtft/fbtft-bus.c:60:1:expected unsigned short [unsigned]
[short] [usertype]
drivers/staging/fbtft/fbtft-bus.c:60:1:got restricted __be16 [usertype]
drivers/staging/fbtft/fbtft-bus.c:60:1: warning: incorrect type in assignment
(different base types)
drivers/staging/fbtft/fbtft-bus.c:60:1:expected unsigned short [unsigned]
[short] [usertype]
drivers/staging/fbtft/fbtft-bus.c:60:1:got restricted __be16 [usertype]
The solution is to add an extra parameter to the macro to
diferenciate between buffer type and data type.
Signed-off-by: Alfonso Lima Astor
---
drivers/staging/fbtft/fbtft-bus.c | 24
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/fbtft/fbtft-bus.c
b/drivers/staging/fbtft/fbtft-bus.c
index a80b5d1..81e8af7 100644
--- a/drivers/staging/fbtft/fbtft-bus.c
+++ b/drivers/staging/fbtft/fbtft-bus.c
@@ -10,33 +10,33 @@
*
*/
-#define define_fbtft_write_reg(func, type, modifier) \
+#define define_fbtft_write_reg(func, buffer_type, data_type, modifier)\
void func(struct fbtft_par *par, int len, ...)\
{ \
va_list args; \
int i, ret; \
int offset = 0; \
- type *buf = (type *)par->buf; \
+ buffer_type *buf = (buffer_type *)par->buf; \
\
if (unlikely(par->debug & DEBUG_WRITE_REGISTER)) {\
va_start(args, len); \
for (i = 0; i < len; i++) { \
- buf[i] = (type)va_arg(args, unsigned int);\
+ buf[i] = modifier((data_type)va_arg(args, unsigned
int)); \
} \
va_end(args); \
- fbtft_par_dbg_hex(DEBUG_WRITE_REGISTER, par, par->info->device,
type, buf, len, "%s: ", __func__); \
+ fbtft_par_dbg_hex(DEBUG_WRITE_REGISTER, par, par->info->device,
buffer_type, buf, len, "%s: ", __func__); \
} \
\
va_start(args, len); \
\
if (par->startbyte) { \
*(u8 *)par->buf = par->startbyte; \
- buf = (type *)(par->buf + 1); \
+ buf = (buffer_type *)(par->buf + 1); \
offset = 1; \
} \
\
- *buf = modifier((type)va_arg(args, unsigned int));\
- ret = fbtft_write_buf_dc(par, par->buf, sizeof(type) + offset, 0);\
+ *buf = modifier((data_type)va_arg(args, unsigned int)); \
+ ret = fbtft_write_buf_dc(par, par->buf, sizeof(data_type) + offset, 0);
\
if (ret < 0) \
goto out; \
len--;\
@@ -47,18 +47,18 @@ void func(struct fbtft_par *par, int len, ...)
\
if (len) {\
i = len; \
while (i--) \
- *buf++ = modifier((type)va_arg(args, unsigned int)); \
+ *buf++ = modifier((data_type)va_arg(args, unsigned
int)); \
fbtft_write_buf_dc(par, par->buf, \
- len * (sizeof(type) + offset), 1); \
+ len * (sizeof(data_type) + offset),