FBTFT: fbtft-bus: Fix code style problems
Subsystems (3)
PATCH 1/1 FBTFT: fbtft-bus: Fix code style problems
From: Dante Paz <[email protected]>
Style and coding function issues were corrected, by avoiding macro functions with a conflicting coding style.
--- drivers/staging/fbtft/fbtft-bus.c | 440 +++++++++++++++++------------- 1 file changed, 254 insertions(+), 186 deletions(-)
drivers/staging/fbtft/fbtft-bus.c +254 -186
@@ -1,7 +1,7 @@// SPDX-License-Identifier: GPL-2.0 #include <linux/export.h> #include <linux/errno.h> -#include <linux/gpio/consumer.h> +#include <linux/gpio.h> #include <linux/spi/spi.h> #include "fbtft.h"
@@ -11,103 +11,171 @@* *****************************************************************************/ -#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; \ - 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] = modifier((data_type)va_arg(args, \ - unsigned int)); \ - } \ - va_end(args); \ - 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 = (buffer_type *)(par->buf + 1); \ - offset = 1; \ - } \ - \ - *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--; \ - \ - if (par->startbyte) \ - *(u8 *)par->buf = par->startbyte | 0x2; \ - \ - if (len) { \ - i = len; \ - while (i--) \ - *buf++ = modifier((data_type)va_arg(args, \ - unsigned int)); \ - fbtft_write_buf_dc(par, par->buf, \ - len * (sizeof(data_type) + offset), 1); \ - } \ -out: \ - va_end(args); \ -} \ -EXPORT_SYMBOL(func); - -define_fbtft_write_reg(fbtft_write_reg8_bus8, u8, u8, ) -define_fbtft_write_reg(fbtft_write_reg16_bus8, __be16, u16, cpu_to_be16) -define_fbtft_write_reg(fbtft_write_reg16_bus16, u16, u16, ) +void fbtft_write_reg8_bus8 (struct fbtft_par *par,int len, ...) +{ +va_list args; +int i, ret; +int offset =0 ; + +u8 *buf = (u8 *)par->buf; + +if (unlikely (par->debug &DEBUG_WRITE_REGISTER )) { +va_start (args, len); +for (i =0 ; i < len; i++) + 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__); + } +va_start (args, len); +if (par->startbyte) { + *(u8 *)par->buf = par->startbyte; + buf = (u8 *)(par->buf +1 ); + offset =1 ; + } + *buf = ((u8)va_arg(args, unsigned int)); + ret =fbtft_write_buf_dc (par, par->buf,sizeof (u8) + offset,0 ); +if (ret <0 ) + goto out; + len--; +if (par->startbyte) + *(u8 *)par->buf = par->startbyte |0x2 ; +if (len) { + i = len; +while (i--) + *buf++ = ((u8)va_arg(args, unsigned int)); +fbtft_write_buf_dc (par, par->buf, + len*(sizeof (u8) + offset),1 ); + } out: +va_end (args); +} +EXPORT_SYMBOL (fbtft_write_reg8_bus8); + +void fbtft_write_reg16_bus8 (struct fbtft_par *par,int len, ...) +{ +va_list args; +int i, ret; +int offset =0 ; + +__be16 *buf = (__be16 *)par->buf; + +if (unlikely (par->debug &DEBUG_WRITE_REGISTER )) { +va_start (args, len); +for (i =0 ; i < len; i++) + buf[i] = cpu_to_be16((u16)va_arg(args, unsigned int)); + +va_end (args); +fbtft_par_dbg_hex (DEBUG_WRITE_REGISTER , par, par->info->device, + __be16, buf, len,"%s: " , __func__); + } +va_start (args, len); +if (par->startbyte) { + *(u8 *)par->buf = par->startbyte; + buf = (__be16 *)(par->buf +1 ); + offset =1 ; + } + *buf = cpu_to_be16((u16)va_arg(args, unsigned int)); + ret =fbtft_write_buf_dc (par, par->buf,sizeof (u16) + offset,0 ); +if (ret <0 ) + goto out; + len--; +if (par->startbyte) + *(u8 *)par->buf = par->startbyte |0x2 ; +if (len) { + i = len; +while (i--) + *buf++ = cpu_to_be16((u16)va_arg(args, unsigned int)); +fbtft_write_buf_dc (par, par->buf, + len*(sizeof (u16) + offset),1 ); + } out: +va_end (args); +} +EXPORT_SYMBOL (fbtft_write_reg16_bus8); + +void fbtft_write_reg16_bus16 (struct fbtft_par *par,int len, ...) +{ +va_list args; +int i, ret; +int offset =0 ; +u16 *buf = (u16 *)par->buf; + +if (unlikely (par->debug &DEBUG_WRITE_REGISTER )) { +va_start (args, len); +for (i =0 ; i < len; i++) + buf[i] = ((u16)va_arg(args, unsigned int)); + +va_end (args); +fbtft_par_dbg_hex (DEBUG_WRITE_REGISTER , par, par->info->device, + u16, buf, len,"%s: " , __func__); + } +va_start (args, len); + +if (par->startbyte) { + *(u8 *)par->buf = par->startbyte; + buf = (u16 *)(par->buf +1 ); + offset =1 ; + } + *buf = ((u16)va_arg(args, unsigned int)); + ret =fbtft_write_buf_dc (par, par->buf,sizeof (u16) + offset,0 ); +if (ret <0 ) + goto out; + len--; +if (par->startbyte) + *(u8 *)par->buf = par->startbyte |0x2 ; +if (len) { + i = len; +while (i--) + *buf++ = ((u16)va_arg(args, unsigned int)); +fbtft_write_buf_dc (par, par->buf, + len*(sizeof (u16) + offset),1 ); + } out: +va_end (args); +} +EXPORT_SYMBOL (fbtft_write_reg16_bus16);void fbtft_write_reg8_bus9 (struct fbtft_par *par,int len, ...) { -va_list args; -int i, ret; -int pad =0 ; -u16 *buf = (u16 *)par->buf; - -if (unlikely (par->debug &DEBUG_WRITE_REGISTER )) { -va_start (args, 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__); - } -if (len <=0 ) -return ; - -if (par->spi && (par->spi->bits_per_word ==8 )) { -/* we're emulating 9-bit, pad start of buffer with no-ops -* (assuming here that zero is a no-op) -*/ - pad = (len %4 ) ?4 - (len %4 ) :0 ; -for (i =0 ; i < pad; i++) - *buf++ =0x000 ; - } - -va_start (args, len); - *buf++ = (u8)va_arg(args, unsigned int); - i = len -1 ; -while (i--) { - *buf = (u8)va_arg(args, unsigned int); - *buf++ |=0x100 ;/* dc=1 */ - } -va_end (args); - ret = par->fbtftops.write (par, par->buf, (len + pad) *sizeof (u16)); -if (ret <0 ) { -dev_err (par->info->device, -"write() failed and returned %d\n" , ret); -return ; - } +va_list args; +int i, ret; +int pad =0 ; +u16 *buf = (u16 *)par->buf; + +if (unlikely (par->debug &DEBUG_WRITE_REGISTER )) { +va_start (args, 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__); + } +if (len <=0 ) +return ; + +if (par->spi && (par->spi->bits_per_word ==8 )) { +/* we're emulating 9-bit, pad start of buffer with no-ops +* (assuming here that zero is a no-op) +*/ + pad = (len %4 ) ?4 - (len %4 ) :0 ; +for (i =0 ; i < pad; i++) + *buf++ =0x000 ; + } + +va_start (args, len); + *buf++ = (u8)va_arg(args, unsigned int); + i = len -1 ; +while (i--) { + *buf = (u8)va_arg(args, unsigned int); + *buf++ |=0x100 ;/* dc=1 */ + } +va_end (args); + ret = par->fbtftops.write (par, par->buf, (len + pad) *sizeof (u16)); +if (ret <0 ) { +dev_err (par->info->device, +"write() failed and returned %d\n" , ret); +return ; + } }EXPORT_SYMBOL (fbtft_write_reg8_bus9);
@@ -120,125 +188,125 @@ EXPORT_SYMBOL(fbtft_write_reg8_bus9);/* 16 bit pixel over 8-bit databus */ int fbtft_write_vmem16_bus8 (struct fbtft_par *par,size_t offset,size_t len) { -u16 *vmem16; -__be16 *txbuf16 = par->txbuf.buf; -size_t remain; -size_t to_copy; -size_t tx_array_size; -int i; -int ret =0 ; -size_t startbyte_size =0 ; - -fbtft_par_dbg (DEBUG_WRITE_VMEM , par,"%s(offset=%zu, len=%zu)\n" , - __func__, offset, len); - - remain = len /2 ; - vmem16 = (u16 *)(par->info->screen_buffer + offset); - -if (!par->gpio.dc) -gpiod_set_value (par->gpio.dc,1 ); - -/* non buffered write */ -if (!par->txbuf.buf) -return par->fbtftops.write (par, vmem16, len); - -/* buffered write */ - tx_array_size = par->txbuf.len /2 ; - -if (par->startbyte) { - txbuf16 = par->txbuf.buf +1 ; - tx_array_size -=2 ; - *(u8 *)(par->txbuf.buf) = par->startbyte |0x2 ; - startbyte_size =1 ; - } - -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); - -for (i =0 ; i < to_copy; i++) - txbuf16[i] =cpu_to_be16 (vmem16[i]); - - vmem16 = vmem16 + to_copy; - ret = par->fbtftops.write (par, par->txbuf.buf, - startbyte_size + to_copy *2 ); -if (ret <0 ) -return ret; - remain -= to_copy; - } - -return ret; +u16 *vmem16; +__be16 *txbuf16 = par->txbuf.buf; +size_t remain; +size_t to_copy; +size_t tx_array_size; +int i; +int ret =0 ; +size_t startbyte_size =0 ; + +fbtft_par_dbg (DEBUG_WRITE_VMEM , par,"%s(offset=%zu, len=%zu)\n" , + __func__, offset, len); + + remain = len /2 ; + vmem16 = (u16 *)(par->info->screen_buffer + offset); + +if (par->gpio.dc !=-1 ) +gpio_set_value (par->gpio.dc,1 ); + +/* non buffered write */ +if (!par->txbuf.buf) +return par->fbtftops.write (par, vmem16, len); + +/* buffered write */ + tx_array_size = par->txbuf.len /2 ; + +if (par->startbyte) { + txbuf16 = par->txbuf.buf +1 ; + tx_array_size -=2 ; + *(u8 *)(par->txbuf.buf) = par->startbyte |0x2 ; + startbyte_size =1 ; + } + +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); + +for (i =0 ; i < to_copy; i++) + txbuf16[i] =cpu_to_be16 (vmem16[i]); + + vmem16 = vmem16 + to_copy; + ret = par->fbtftops.write (par, par->txbuf.buf, + startbyte_size + to_copy *2 ); +if (ret <0 ) +return ret; + remain -= to_copy; + } + +return ret; }EXPORT_SYMBOL (fbtft_write_vmem16_bus8);/* 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) { -u8 *vmem8; -u16 *txbuf16 = par->txbuf.buf; -size_t remain; -size_t to_copy; -size_t tx_array_size; -int i; -int ret =0 ; +u8 *vmem8; +u16 *txbuf16 = par->txbuf.buf; +size_t remain; +size_t to_copy; +size_t tx_array_size; +int i; +int ret =0 ; -fbtft_par_dbg (DEBUG_WRITE_VMEM , par,"%s(offset=%zu, len=%zu)\n" , - __func__, offset, len); +fbtft_par_dbg (DEBUG_WRITE_VMEM , par,"%s(offset=%zu, len=%zu)\n" , + __func__, offset, len); -if (!par->txbuf.buf) { -dev_err (par->info->device,"%s: txbuf.buf is NULL\n" , __func__); -return -1 ; - } +if (!par->txbuf.buf) { +dev_err (par->info->device,"%s: txbuf.buf is NULL\n" , __func__); +return -1 ; + } - remain = len; - vmem8 = par->info->screen_buffer + offset; + remain = len; + vmem8 = par->info->screen_buffer + offset; - tx_array_size = par->txbuf.len /2 ; + tx_array_size = par->txbuf.len /2 ; -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); +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);#ifdef __LITTLE_ENDIAN -for (i =0 ; i < to_copy; i +=2 ) { - txbuf16[i] =0x0100 | vmem8[i +1 ]; - txbuf16[i +1 ] =0x0100 | vmem8[i]; - } +for (i =0 ; i < to_copy; i +=2 ) { + txbuf16[i] =0x0100 | vmem8[i +1 ]; + txbuf16[i +1 ] =0x0100 | vmem8[i]; + }#else -for (i =0 ; i < to_copy; i++) - txbuf16[i] =0x0100 | vmem8[i]; +for (i =0 ; i < to_copy; i++) + txbuf16[i] =0x0100 | vmem8[i];#endif - vmem8 = vmem8 + to_copy; - ret = par->fbtftops.write (par, par->txbuf.buf, to_copy *2 ); -if (ret <0 ) -return ret; - remain -= to_copy; - } - -return ret; + vmem8 = vmem8 + to_copy; + ret = par->fbtftops.write (par, par->txbuf.buf, to_copy *2 ); +if (ret <0 ) +return ret; + remain -= to_copy; + } + +return ret; }EXPORT_SYMBOL (fbtft_write_vmem16_bus9);int fbtft_write_vmem8_bus8 (struct fbtft_par *par,size_t offset,size_t len) { -dev_err (par->info->device,"%s: function not implemented\n" , __func__); -return -1 ; +dev_err (par->info->device,"%s: function not implemented\n" , __func__); +return -1 ; }EXPORT_SYMBOL (fbtft_write_vmem8_bus8);/* 16 bit pixel over 16-bit databus */ int fbtft_write_vmem16_bus16 (struct fbtft_par *par,size_t offset,size_t len) { -u16 *vmem16; +u16 *vmem16; -fbtft_par_dbg (DEBUG_WRITE_VMEM , par,"%s(offset=%zu, len=%zu)\n" , - __func__, offset, len); +fbtft_par_dbg (DEBUG_WRITE_VMEM , par,"%s(offset=%zu, len=%zu)\n" , + __func__, offset, len); - vmem16 = (u16 *)(par->info->screen_buffer + offset); + vmem16 = (u16 *)(par->info->screen_buffer + offset); -/* no need for buffered write with 16-bit bus */ -return fbtft_write_buf_dc (par, vmem16, len,1 ); +/* no need for buffered write with 16-bit bus */ +return fbtft_write_buf_dc (par, vmem16, len,1 ); }EXPORT_SYMBOL (fbtft_write_vmem16_bus16);
Signature · 1 line
2.17.2
Quoted 4 lines · Dante Paz
From: Dante Paz <[email protected]>
Style and coding function issues were corrected, by avoiding macro functions with a conflicting coding style.
Signed-off-by Dante Paz <[email protected]>
Line too long. No blank. Fix indenting.
It's not really clear what you're trying to do actually... You need to sell your patch a bit to try convince us that it's worth applying.
regards,
dan carpenter
I feel like you need to break the patch up a bit and do the white space fixes separate from the other changes.
(Probably you're going to have to redo this several times because it's hard to review when it's so mixed up with multiple changes at the same time).
regards,
dan carpenter
Hi Dan,
Thanks a lot for your feedback, this is my first patch for the linux kernel so I'm learning a lot from your comments.
I'll try to make a more clear version of the patch following your suggestions
to resubmit.
Best,
Dante Paz
Quoted 11 lines · Dan Carpenter
I feel like you need to break the patch up a bit and do the white space fixes separate from the other changes.
(Probably you're going to have to redo this several times because it's hard to review when it's so mixed up with multiple changes at the same time).
regards,
dan carpenter
Signature · 12 lines
-- Dr. Dante Javier Paz Instituto de Astronomía, Teórica y Experimental, IATE Observatorio Astronómico de Córdoba Tel: (54) 351-5353776 ext 75643 Web: www.iate.oac.uncor.edu Laprida 854 X5000BGR - Córdoba ARGENTINA
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Hi Dante
Thanks for the patch.
Quoted 4 lines · Dante Paz
From: Dante Paz <[email protected]>
Style and coding function issues were corrected, by avoiding macro functions with a conflicting coding style.
Signed-off-by Dante Paz <[email protected]>
But it raised a few comments.
The staging/fbtft is a dumping of a set of drivers that
in the end will be migrated to DRM.
And there is not much gained trying to do coding style changes to these drivers.
So please conmsider finding a drver where this is more relevant.
Furthermore that patch presented is hard to review as it contains too much changes in one go.
As a rule of thumb include only one type of change per patch. This is worth to keep in mind for future submissions.
It it then also good to present the trivial changes first(*), and the less trivial changes later.
(*) Like whitespace to tabs, spellign errors etc.
Sam
Hello Sam, thank you very much for your comments,
As I told Dan (my email did not reach the mailing list) this is my first attempt to contribute,
So I'm learning a lot from your advice and corrections.
I will look for TODO lists to see if there are more useful contributions to make, all suggestions are also welcome.
Thanks again for the patience of all of you.
Best,
Dante
Quoted 29 lines · Sam Ravnborg
Hi Dante
Thanks for the patch.
Quoted 4 lines · Dante Paz
From: Dante Paz <[email protected]>
Style and coding function issues were corrected, by avoiding macro functions with a conflicting coding style.
Signed-off-by Dante Paz <[email protected]>But it raised a few comments.
The staging/fbtft is a dumping of a set of drivers that
in the end will be migrated to DRM.
And there is not much gained trying to do coding style changes to these drivers.
So please conmsider finding a drver where this is more relevant.Furthermore that patch presented is hard to review as it contains too much changes in one go.
As a rule of thumb include only one type of change per patch. This is worth to keep in mind for future submissions.It it then also good to present the trivial changes
first(*), and the less trivial changes later.(*) Like whitespace to tabs, spellign errors etc.
Sam
Signature · 16 lines
-- Dr. Dante Javier Paz Instituto de Astronomía, Teórica y Experimental, IATE Observatorio Astronómico de Córdoba Tel: (54) 351-5353776 ext 75643 Web: www.iate.oac.uncor.edu Laprida 854 X5000BGR - Córdoba ARGENTINA _______________________________________________ devel mailing list [email protected] http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Hi everyone,
Dante: please avoid top-posting. In other words, put your replies in-line, like I'm gonna do now. See below (and see how discussion goes on other threads).
Quoted 9 lines · DANTE JAVIER PAZ
Hello Sam, thank you very much for your comments,
As I told Dan (my email did not reach the mailing list) this is my first attempt to contribute,
So I'm learning a lot from your advice and corrections.I will look for TODO lists to see if there are more useful contributions to make, all suggestions are also welcome.
Quoted 24 lines
Thanks again for the patience of all of you.
Best,
DanteEl lun., 11 mar. 2019 a las 13:25, Sam Ravnborg (<[email protected]>) escribió:
Quoted 18 lines
Hi Dante
Thanks for the patch.
Quoted 4 lines · Dante Paz
From: Dante Paz <[email protected]>
Style and coding function issues were corrected, by avoiding macro functions with a conflicting coding style.
Signed-off-by Dante Paz <[email protected]>But it raised a few comments.
The staging/fbtft is a dumping of a set of drivers that
in the end will be migrated to DRM.
And there is not much gained trying to do coding style changes to these drivers.
So please conmsider finding a drver where this is more relevant.
Sam,
Why is this driver still here? I thought we migrated everyhing to tinydrm already.
Maybe there's a list of panels still not migrated?
Thanks,
Eze
Hi Eze
Quoted 3 lines
Why is this driver still here? I thought we migrated everyhing to tinydrm already.
Some have been ported, some are waiting for a user to do the port. If you looks at tinydrm you will see:ili9225.c ili9341.c
And we also have under panel:panel-ilitek-ili9881c.cpanel-ilitek-ili9322.c
But in staging there are more panels than just these.
So we have not yet ported all.
And there is today no list of what is missing.
Sam
Quoted 9 lines · Sam Ravnborg
Hi Eze
Quoted 3 lines
Why is this driver still here? I thought we migrated everyhing to tinydrm already.
Some have been ported, some are waiting for a user to do the port. If you looks at tinydrm you will see:
ili9225.cili9341.c
Quoted 9 lines
And we also have under panel:
panel-ilitek-ili9881c.cpanel-ilitek-ili9322.cBut in staging there are more panels than just these.
So we have not yet ported all.
And there is today no list of what is missing.
Right.
Perhaps the TODO file on fbtft should be updated stating clearly that we don't care about cleaning this one.
This is important given staging is used for Outreachy and other introductory programs.
We can also add some big fat warning message (in case there isn't one already) asking users of staging/fbtft to help porting/testing the port to tinydrm.
Thanks,
Eze
Hi Dante.
Quoted 7 lines
Hello Sam, thank you very much for your comments,
As I told Dan (my email did not reach the mailing list) this is my first attempt to contribute,
So I'm learning a lot from your advice and corrections.I will look for TODO lists to see if there are more useful contributions to make, all suggestions are also welcome.
Keep the good spirit, and find some other driver to look into.
You must realise than experienced developers sometimes goes through several version before a patch is ready. So expect it to be a bumpy ride the first few times.
Good luck!
Sam