diff options
| author | Katie Dunne <kdunne@mail.ccsf.edu> | 2017-02-20 12:24:40 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-03-06 09:16:59 +0100 |
| commit | a8ba84626b1b33ff53c4adaff9b69304eb41877f (patch) | |
| tree | 5a376e9c1b200d0c041d6748bd91b5eb64eee64d /drivers/staging/xgifb/XGI_main_26.c | |
| parent | 7bc6edf95b20b526b12b3a326845b21ba7adfe31 (diff) | |
| download | op-kernel-dev-a8ba84626b1b33ff53c4adaff9b69304eb41877f.zip op-kernel-dev-a8ba84626b1b33ff53c4adaff9b69304eb41877f.tar.gz | |
staging: xgifb: add braces around if-statements
Add braces to instances of if-statements found by checkpatch.pl
to conform to kernel style.
Signed-off-by: Katie Dunne <kdunne@mail.ccsf.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/xgifb/XGI_main_26.c')
| -rw-r--r-- | drivers/staging/xgifb/XGI_main_26.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/drivers/staging/xgifb/XGI_main_26.c b/drivers/staging/xgifb/XGI_main_26.c index 6895235..69ed137 100644 --- a/drivers/staging/xgifb/XGI_main_26.c +++ b/drivers/staging/xgifb/XGI_main_26.c @@ -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 @@ -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); |
