staging: fbtft: Replace a bit shift by a use of BIT.
Subsystems (2)
PATCH 1/1 staging: fbtft: Replace a bit shift by a use of BIT.
This patch replaces bit shifting on 1 with the BIT(x) macro. This was done with coccinelle:
@@
constant c;
@@
-1 << c
+BIT(c)
--- drivers/staging/fbtft/fb_agm1264k-fl.c | 4 ++-- drivers/staging/fbtft/fb_ili9163.c | 2 +- drivers/staging/fbtft/fb_ili9325.c | 2 +- drivers/staging/fbtft/fb_ssd1289.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-)
drivers/staging/fbtft/fb_agm1264k-fl.c +2 -2
@@ -369,7 +369,7 @@ static int write_vmem(struct fbtft_par *par, size_t offset, size_t len)/* select left side (sc0) * set addr */ -write_reg (par,0x00 , (1 <<6 ) | (u8 )addr_win.xs); +write_reg (par,0x00 , (BIT (6 )) | (u8 )addr_win.xs);write_reg (par,0x00 , (0x17 <<3 ) | (u8 )y);/* write bitmap */
@@ -392,7 +392,7 @@ static int write_vmem(struct fbtft_par *par, size_t offset, size_t len)/* select right side (sc1) * set addr */ -write_reg (par,0x01 ,1 <<6 ); +write_reg (par,0x01 ,BIT (6 ));write_reg (par,0x01 , (0x17 <<3 ) | (u8 )y);/* write bitmap */
drivers/staging/fbtft/fb_ili9163.c +1 -1
@@ -194,7 +194,7 @@ static int set_var(struct fbtft_par *par)/* Colorspcae */ if (par->bgr) - mactrl_data |= (1 <<2 ); + mactrl_data |= (BIT (2 ));write_reg (par,MIPI_DCS_SET_ADDRESS_MODE , mactrl_data);write_reg (par,MIPI_DCS_WRITE_MEMORY_START );return 0 ;
drivers/staging/fbtft/fb_ili9325.c +1 -1
@@ -126,7 +126,7 @@ static int init_display(struct fbtft_par *par)write_reg (par,0x0013 ,0x0000 );/* VDV[4:0] for VCOM amplitude */ mdelay (200 );/* Dis-charge capacitor power voltage */ write_reg (par,0x0010 ,/* SAP, BT[3:0], AP, DSTB, SLP, STB */ - (1 <<12 ) | (bt <<8 ) | (1 <<7 ) | (0x01 <<4 )); + (BIT (12 )) | (bt <<8 ) | (BIT (7 )) | (BIT (4 )));write_reg (par,0x0011 ,0x220 | vc);/* DC1[2:0], DC0[2:0], VC[2:0] */ mdelay (50 );/* Delay 50ms */ write_reg (par,0x0012 , vrh);/* Internal reference voltage= Vci; */
drivers/staging/fbtft/fb_ssd1289.c +1 -1
@@ -47,7 +47,7 @@ static int init_display(struct fbtft_par *par)write_reg (par,0x0E ,0x2B00 );write_reg (par,0x1E ,0x00B7 );write_reg (par,0x01 , - (1 <<13 ) | (par->bgr <<11 ) | (1 <<9 ) | (HEIGHT -1 )); + (BIT (13 )) | (par->bgr <<11 ) | (BIT (9 )) | (HEIGHT -1 ));write_reg (par,0x02 ,0x0600 );write_reg (par,0x10 ,0x0000 );write_reg (par,0x05 ,0x0000 );
Signature · 1 line
2.11.0
Quoted 9 lines · Arushi Singhal
This patch replaces bit shifting on 1 with the BIT(x) macro. This was done with coccinelle:
@@
constant c;
@@-1 << c
+BIT(c)
While using BIT() macro is a good idea, you make it inconsistent here. There are at least two options:
- do nothing
- define _MASK:s with GENMASK() and reuse in the code (looking at the code they are masks, not just separate bits).
Quoted 72 lines
Signed-off-by Arushi Singhal <[email protected]>--- drivers/staging/fbtft/fb_agm1264k-fl.c | 4 ++-- drivers/staging/fbtft/fb_ili9163.c | 2 +- drivers/staging/fbtft/fb_ili9325.c | 2 +- drivers/staging/fbtft/fb_ssd1289.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-)drivers/staging/fbtft/fb_agm1264k-fl.c +2
-2@@ -369,7 +369,7 @@ static int write_vmem(struct fbtft_par *par, size_t offset, size_t len)/* select left side (sc0) * set addr */ -write_reg (par,0x00 , (1 <<6 ) | (u8 )addr_win.xs); +write_reg (par,0x00 , (BIT (6 )) | (u8 )addr_win.xs);write_reg (par,0x00 , (0x17 <<3 ) | (u8 )y);/* write bitmap */ @@ -392,7 +392,7 @@ static int write_vmem(struct fbtft_par *par, size_t offset, size_t len)/* select right side (sc1) * set addr */ -write_reg (par,0x01 ,1 <<6 ); +write_reg (par,0x01 ,BIT (6 ));write_reg (par,0x01 , (0x17 <<3 ) | (u8 )y);/* write bitmap */ drivers/staging/fbtft/fb_ili9163.c +1
-1@@ -194,7 +194,7 @@ static int set_var(struct fbtft_par *par)/* Colorspcae */ if (par->bgr) - mactrl_data |= (1 <<2 ); + mactrl_data |= (BIT (2 ));write_reg (par,MIPI_DCS_SET_ADDRESS_MODE , mactrl_data);write_reg (par,MIPI_DCS_WRITE_MEMORY_START );return 0 ;drivers/staging/fbtft/fb_ili9325.c +1
-1@@ -126,7 +126,7 @@ static int init_display(struct fbtft_par *par)write_reg (par,0x0013 ,0x0000 );/* VDV[4:0] for VCOM amplitude */ mdelay (200 );/* Dis-charge capacitor power voltage */ write_reg (par,0x0010 ,/* SAP, BT[3:0], AP, DSTB, SLP, STB */ - (1 <<12 ) | (bt <<8 ) | (1 <<7 ) | (0x01 <<4 )); + (BIT (12 )) | (bt <<8 ) | (BIT (7 )) | (BIT (4 )));write_reg (par,0x0011 ,0x220 | vc);/* DC1[2:0], DC0[2:0], VC[2:0] */ mdelay (50 );/* Delay 50ms */ write_reg (par,0x0012 , vrh);/* Internal reference voltage= Vci; */ drivers/staging/fbtft/fb_ssd1289.c +1
-2@@ -47,7 +47,7 @@ static int init_display(struct fbtft_par *par)write_reg (par,0x0E ,0x2B00 );write_reg (par,0x1E ,0x00B7 );write_reg (par,0x01 , - (1 <<13 ) | (par->bgr <<11 ) | (1 <<9 ) | (HEIGHT -1 )); + (BIT (13 )) | (par->bgr <<11 ) | (BIT (9 )) | (HEIGHT -1 ));write_reg (par,0x02 ,0x0600 );write_reg (par,0x10 ,0x0000 );write_reg (par,0x05 ,0x0000 ); --2.11.0
Signature · 2 lines
With Best Regards, Andy Shevchenko
Quoted 12 lines · Andy Shevchenko
Quoted 9 lines · Arushi Singhal
This patch replaces bit shifting on 1 with the BIT(x) macro. This was done with coccinelle:
@@
constant c;
@@-1 << c
+BIT(c)
Quoted 5 lines
While using
BIT()macro is a good idea, you make it inconsistent here. There are at least two options:
- do nothing
- define _MASK:s withGENMASK()and reuse in the code (looking at the code they are masks, not just separate bits).
Looking a bit more, not masks, but values.
So, best would be define for bits and values like 0x17.
One more thing, you don't need extra parens surround BIT() macro.
Signature · 2 lines
With Best Regards, Andy Shevchenko
Quoted 12 lines · Andy Shevchenko
Quoted 9 lines · Arushi Singhal
This patch replaces bit shifting on 1 with the BIT(x) macro. This was done with coccinelle:
@@
constant c;
@@-1 << c
+BIT(c)
Quoted 6 lines
While using
BIT()macro is a good idea, you make it inconsistent here. There are at least two options:
- do nothing
- define _MASK:s withGENMASK()and reuse in the code (looking at the code they are masks, not just separate bits).
Hi Andy
I somewhat understood my mistake and your views.
But It would be great if you can highlight more for my better understanding. Thanks
Arushi Singhal
Quoted 89 lines
Review
Quoted 11 lines
Signed-off-by Arushi Singhal <[email protected]>--- drivers/staging/fbtft/fb_agm1264k-fl.c | 4 ++-- drivers/staging/fbtft/fb_ili9163.c | 2 +- drivers/staging/fbtft/fb_ili9325.c | 2 +- drivers/staging/fbtft/fb_ssd1289.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-)(quoted diff) +0
-0
b/drivers/staging/fbtft/fb_agm1264k-fl.cdrivers/staging/fbtft/fb_agm1264k-fl.c static int write_vmem(struct fbtft_par *par, size_t
Quoted 4 lines
index
4ee76dbd30b5..d31deeab69b2100644drivers/staging/fbtft/fb_agm1264k-fl.c +0
-0@@ -369,7 +369,7 @@ static int write_vmem(struct fbtft_par *par, size_toffset,
size_tlen)drivers/staging/fbtft/fb_agm1264k-fl.c static int write_vmem(struct fbtft_par *par, size_t
Quoted 9 lines
drivers/staging/fbtft/fb_agm1264k-fl.c +1
-1/* select left side (sc0) * set addr */ -write_reg (par,0x00 , (1 <<6 ) | (u8 )addr_win.xs); +write_reg (par,0x00 , (BIT (6 )) | (u8 )addr_win.xs);write_reg (par,0x00 , (0x17 <<3 ) | (u8 )y);/* write bitmap */ @@ -392,7 +392,7 @@ static int write_vmem(struct fbtft_par *par, size_toffset,
size_tlen)Review
Quoted 9 lines
drivers/staging/fbtft/fb_agm1264k-fl.c +1
-1/* select right side (sc1) * set addr */ -write_reg (par,0x01 ,1 <<6 ); +write_reg (par,0x01 ,BIT (6 ));write_reg (par,0x01 , (0x17 <<3 ) | (u8 )y);/* write bitmap */ (quoted diff) +0
-0
b/drivers/staging/fbtft/fb_ili9163.cReview
Quoted 13 lines
index
579e17734612..06a5a5f6e33e100644drivers/staging/fbtft/fb_ili9163.c +1
-1@@ -194,7 +194,7 @@ static int set_var(struct fbtft_par *par)/* Colorspcae */ if (par->bgr) - mactrl_data |= (1 <<2 ); + mactrl_data |= (BIT (2 ));write_reg (par,MIPI_DCS_SET_ADDRESS_MODE , mactrl_data);write_reg (par,MIPI_DCS_WRITE_MEMORY_START );return 0 ;(quoted diff) +0
-0
b/drivers/staging/fbtft/fb_ili9325.cdrivers/staging/fbtft/fb_ili9325.c static int init_display(struct fbtft_par *par) · line 130
Quoted 10 lines
index
7189de5ae4b3..ab1267a9cd11100644drivers/staging/fbtft/fb_ili9325.c +1
-1@@ -126,7 +126,7 @@ static int init_display(struct fbtft_par *par)write_reg (par,0x0013 ,0x0000 );/* VDV[4:0] for VCOM amplitude */ mdelay (200 );/* Dis-charge capacitor power voltage */ write_reg (par,0x0010 ,/* SAP, BT[3:0], AP, DSTB, SLP, STB */ - (1 <<12 ) | (bt <<8 ) | (1 <<7 ) | (0x01 <<4 )); + (BIT (12 )) | (bt <<8 ) | (BIT (7 )) | (BIT (4 )));write_reg (par,0x0011 ,0x220 | vc);/* DC1[2:0], DC0[2:0], VC[2:0] */
drivers/staging/fbtft/fb_ili9325.c static int init_display(struct fbtft_par *par) · line 132
Quoted 2 lines
drivers/staging/fbtft/fb_ili9325.c +0
-0mdelay (50 );/* Delay 50ms */ write_reg (par,0x0012 , vrh);/* Internal reference voltage= Vci; */
Review
Quoted 1 line
(quoted diff) +0
-0
b/drivers/staging/fbtft/fb_ssd1289.cQuoted 13 lines
index
c603e1516e64..b22a07d79b34100644drivers/staging/fbtft/fb_ssd1289.c +1
-2@@ -47,7 +47,7 @@ static int init_display(struct fbtft_par *par)write_reg (par,0x0E ,0x2B00 );write_reg (par,0x1E ,0x00B7 );write_reg (par,0x01 , - (1 <<13 ) | (par->bgr <<11 ) | (1 <<9 ) | (HEIGHT -1 )); + (BIT (13 )) | (par->bgr <<11 ) | (BIT (9 )) | (HEIGHT -1 ));write_reg (par,0x02 ,0x0600 );write_reg (par,0x10 ,0x0000 );write_reg (par,0x05 ,0x0000 ); --Quoted 2 lines
2.11.0
--
With Best Regards,
Andy Shevchenko