Staging: xgifb:XGI_main_26: Added braces to the 'if' statement
PATCH 1/2 Staging: xgifb:XGI_main_26: Added braces to the 'if' statement
Coding style issue. Added brances to the 'if' statement.
Signed-off-by Georgios Emmanouil <[email protected]>
--- drivers/staging/xgifb/XGI_main_26.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/xgifb/XGI_main_26.c +2 -2
@@ -1480,9 +1480,9 @@ static void XGIfb_detect_VB(struct xgifb_video_info *xgifb_info) cr32 =xgifb_reg_get (XGICR ,IND_XGI_SCRATCH_REG_CR32 ); -if ((cr32 &SIS_CRT1 ) && !XGIfb_crt1off) +if ((cr32 &SIS_CRT1 ) && !XGIfb_crt1off) { XGIfb_crt1off =0 ; -else { + }else {if (cr32 &0x5F ) XGIfb_crt1off =1 ;else
--
2.1.4
PATCH 2/2 Staging: xgifb:XGI_main_26: Added braces to the conditional statement
Coding style issue. Added brances to the conditional statement.
Signed-off-by Georgios Emmanouil <[email protected]>
--- drivers/staging/xgifb/XGI_main_26.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
drivers/staging/xgifb/XGI_main_26.c +6 -5
@@ -1500,18 +1500,19 @@ static void XGIfb_detect_VB(struct xgifb_video_info *xgifb_info) xgifb_info->display2 =XGIFB_DISP_NONE ; } -if (XGIfb_tvplug !=-1 ) +if (XGIfb_tvplug !=-1 ) {/* Override with option */ xgifb_info->TV_plug = XGIfb_tvplug; -else if (cr32 &SIS_VB_HIVISION ) { + }else if (cr32 &SIS_VB_HIVISION ) { xgifb_info->TV_type =TVMODE_HIVISION ; xgifb_info->TV_plug =TVPLUG_SVIDEO ; - }else if (cr32 &SIS_VB_SVIDEO ) + }else if (cr32 &SIS_VB_SVIDEO ) { xgifb_info->TV_plug =TVPLUG_SVIDEO ; -else if (cr32 &SIS_VB_COMPOSITE ) + }else if (cr32 &SIS_VB_COMPOSITE ) { xgifb_info->TV_plug =TVPLUG_COMPOSITE ; -else if (cr32 &SIS_VB_SCART ) + }else if (cr32 &SIS_VB_SCART ) { xgifb_info->TV_plug =TVPLUG_SCART ; + }if (xgifb_info->TV_type ==0 ) {
temp = xgifb_reg_get(XGICR, 0x38);
--
2.1.4
Greg KH
maintainerRe: [PATCH 2/2] Staging: xgifb:XGI_main_26: Added braces to the conditional statement
Quoted 6 lines · Georgios Emmanouil
Coding style issue. Added brances to the conditional statement.
Signed-off-by Georgios Emmanouil <[email protected]>--- drivers/staging/xgifb/XGI_main_26.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
Same here, someone else already did this :(
Greg KH
maintainerQuoted 6 lines · Georgios Emmanouil
Coding style issue. Added brances to the 'if' statement.
Signed-off-by Georgios Emmanouil <[email protected]>--- drivers/staging/xgifb/XGI_main_26.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Someone sent this same change in just before you did, sorry :(
greg k-h