staging: fbtft: fix character limit, trailing ; warning, etc.
Subsystems (2)
PATCH 1/1 staging: fbtft: fix character limit, trailing ; warning, etc.
checkpatch spits out a warning about the 80 character line limit. Split the parameters of these functions onto different lines. Put the ; with the macro caller instead. Lined up parameters as there was another CHECK warning about that.
--- drivers/staging/fbtft/fbtft-bus.c | 36 +++++++++++++++++++++--------------- 1 file changed, 21 insertions(+), 15 deletions(-)
drivers/staging/fbtft/fbtft-bus.c +21 -15
@@ -24,7 +24,9 @@ void func(struct fbtft_par *par, int len, ...) \ buf[i] = (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, type, buf, len,"%s: " , \ + __func__); \ } \ \va_start (args, len); \
@@ -41,7 +43,9 @@ void func(struct fbtft_par *par, int len, ...) \ ret = par->fbtftops.write (par, par->buf,sizeof (type) + offset); \if (ret <0 ) { \va_end (args); \ -dev_err (par->info->device,"%s: write() failed and returned %d\n" , __func__, ret); \ +dev_err (par->info->device, \ +"%s: write() failed and returned %d\n" , __func__, \ + ret); \return ; \ } \ len--; \
@@ -60,17 +64,19 @@ void func(struct fbtft_par *par, int len, ...) \ len * (sizeof(type) + offset)); \if (ret <0 ) { \va_end (args); \ -dev_err (par->info->device,"%s: write() failed and returned %d\n" , __func__, ret); \ +dev_err (par->info->device, \ +"%s: write() failed and returned %d\n" , \ + __func__, ret); \return ; \ } \ } \va_end (args); \ } \ -EXPORT_SYMBOL (func); +EXPORT_SYMBOL (func) -define_fbtft_write_reg(fbtft_write_reg8_bus8, u8, ) -define_fbtft_write_reg(fbtft_write_reg16_bus8, u16, cpu_to_be16) -define_fbtft_write_reg(fbtft_write_reg16_bus16, u16, ) +define_fbtft_write_reg(fbtft_write_reg8_bus8, u8, ); +define_fbtft_write_reg (fbtft_write_reg16_bus8, u16, cpu_to_be16); +define_fbtft_write_reg(fbtft_write_reg16_bus16, u16, );void fbtft_write_reg8_bus9 (struct fbtft_par *par,int len, ...) {
@@ -84,8 +90,8 @@ void fbtft_write_reg8_bus9(struct fbtft_par *par, int len, ...)for (i =0 ; i < len; i++) *(((u8 *)buf) + i) = (u8)va_arg(args, unsigned int);va_end (args); -fbtft_par_dbg_hex (DEBUG_WRITE_REGISTER , par, - par->info->device, u8, buf, len,"%s: " , __func__); +fbtft_par_dbg_hex (DEBUG_WRITE_REGISTER , par, par->info->device, + u8, buf, len,"%s: " , __func__); }if (len <=0 )return ;
@@ -135,7 +141,7 @@ int fbtft_write_vmem16_bus8(struct fbtft_par *par, size_t offset, size_t len)size_t startbyte_size =0 ;fbtft_par_dbg (DEBUG_WRITE_VMEM , par,"%s(offset=%zu, len=%zu)\n" , - __func__, offset, len); + __func__, offset, len); remain = len /2 ; vmem16 = (u16 *)(par->info->screen_buffer + offset);
@@ -159,8 +165,8 @@ int fbtft_write_vmem16_bus8(struct fbtft_par *par, size_t offset, size_t len)while (remain) { to_copy =min (tx_array_size, remain); -dev_dbg (par->info->device," to_copy=%zu, remain=%zu\n" , - to_copy, remain - to_copy); +dev_dbg (par->info->device,"to_copy=%zu, remain=%zu\n" , to_copy, + remain - to_copy);for (i =0 ; i < to_copy; i++) txbuf16[i] =cpu_to_be16 (vmem16[i]);
@@ -189,7 +195,7 @@ int fbtft_write_vmem16_bus9(struct fbtft_par *par, size_t offset, size_t len)int ret =0 ;fbtft_par_dbg (DEBUG_WRITE_VMEM , par,"%s(offset=%zu, len=%zu)\n" , - __func__, offset, len); + __func__, offset, len);if (!par->txbuf.buf) {dev_err (par->info->device,"%s: txbuf.buf is NULL\n" , __func__);
@@ -204,7 +210,7 @@ int fbtft_write_vmem16_bus9(struct fbtft_par *par, size_t offset, size_t len)while (remain) { to_copy =min (tx_array_size, remain);dev_dbg (par->info->device," to_copy=%zu, remain=%zu\n" , - to_copy, remain - to_copy); + to_copy, remain - to_copy);#ifdef __LITTLE_ENDIANfor (i =0 ; i < to_copy; i +=2 ) {
@@ -239,7 +245,7 @@ int fbtft_write_vmem16_bus16(struct fbtft_par *par, size_t offset, size_t len)u16 *vmem16;fbtft_par_dbg (DEBUG_WRITE_VMEM , par,"%s(offset=%zu, len=%zu)\n" , - __func__, offset, len); + __func__, offset, len); vmem16 = (u16 *)(par->info->screen_buffer + offset);
Signature · 1 line
2.7.4
Greg KH
maintainerQuoted 9 lines · Eric Curtin
checkpatch spits out a warning about the 80 character line limit. Split the parameters of these functions onto different lines. Put the ; with the macro caller instead. Lined up parameters as there was another CHECK warning about that.
Signed-off-by Eric Curtin <[email protected]>--- drivers/staging/fbtft/fbtft-bus.c | 36 +++++++++++++++++++++--------------- 1 file changed, 21 insertions(+), 15 deletions(-)
Patch does not apply to my tree at all :(
Quoted 6 lines · Greg KH
Quoted 5 lines · Eric Curtin
checkpatch spits out a warning about the 80 character line limit. Split the parameters of these functions onto different lines. Put the ; with the macro caller instead. Lined up parameters as there was another CHECK warning about that.
Quoted 6 lines
Quoted 4 lines
Signed-off-by Eric Curtin <[email protected]>--- drivers/staging/fbtft/fbtft-bus.c | 36 +++++++++++++++++++++--------------- 1 file changed, 21 insertions(+), 15 deletions(-)Patch does not apply to my tree at all :(
Hi Greg,
Sorry I didn't realize you replied. I gave up on these drivers because I read around and saw that these drivers are unlikely to ever be merged properly into the mainline kernel, while they use this deprecated framework:
https://github.com/notro/fbtft/wiki/Development
I know you were involved in some of these conversations:
https://lkml.org/lkml/2016/11/23/146
My main reason for helping with this, was so my rpi3 display would "just work" on future distro's I installed. I'd struggle to port to this new framework as I have no experience with drivers.