Skip to content

L
linux
Commit 990e5666 authored by Anatoly Stepanov's avatar Anatoly Stepanov Committed by Greg Kroah-Hartman
Browse files
Options

staging: sm750fb: fix 'switch and case' indentation 

Fix according to checkpatch.pl message:
"ERROR: switch and case should be at the same indent"
Signed-off-by: default avatarAnatoly Stepanov <drivengroove@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5e83e283
Hide whitespace changes
Inline Side-by-side
Showing with 86 additions and 86 deletions
drivers/staging/sm750fb/sm750_hw.c
View file @ 990e5666
...@@ -153,15 +153,15 @@ int hw_sm750_inithw(struct lynx_share *share, struct pci_dev *pdev) ...@@ -153,15 +153,15 @@ int hw_sm750_inithw(struct lynx_share *share, struct pci_dev *pdev)
} }
switch (spec_share->state.pnltype) { switch (spec_share->state.pnltype) {
case sm750_doubleTFT: case sm750_doubleTFT:
case sm750_24TFT: case sm750_24TFT:
case sm750_dualTFT: case sm750_dualTFT:
POKE32(PANEL_DISPLAY_CTRL, POKE32(PANEL_DISPLAY_CTRL,
FIELD_VALUE(PEEK32(PANEL_DISPLAY_CTRL), FIELD_VALUE(PEEK32(PANEL_DISPLAY_CTRL),
PANEL_DISPLAY_CTRL, PANEL_DISPLAY_CTRL,
TFT_DISP, TFT_DISP,
spec_share->state.pnltype)); spec_share->state.pnltype));
break; break;
} }
} else { } else {
/* for 750LE ,no DVI chip initilization makes Monitor no signal */ /* for 750LE ,no DVI chip initilization makes Monitor no signal */
...@@ -267,17 +267,17 @@ int hw_sm750_crtc_checkMode(struct lynxfb_crtc *crtc, struct fb_var_screeninfo * ...@@ -267,17 +267,17 @@ int hw_sm750_crtc_checkMode(struct lynxfb_crtc *crtc, struct fb_var_screeninfo *
share = container_of(crtc, struct lynxfb_par, crtc)->share; share = container_of(crtc, struct lynxfb_par, crtc)->share;
switch (var->bits_per_pixel) { switch (var->bits_per_pixel) {
case 8: case 8:
case 16: case 16:
break; break;
case 32: case 32:
if (share->revid == SM750LE_REVISION_ID) { if (share->revid == SM750LE_REVISION_ID) {
pr_debug("750le do not support 32bpp\n"); pr_debug("750le do not support 32bpp\n");
return -EINVAL;
}
break;
default:
return -EINVAL; return -EINVAL;
}
break;
default:
return -EINVAL;
} }
...@@ -307,16 +307,16 @@ int hw_sm750_crtc_setMode(struct lynxfb_crtc *crtc, ...@@ -307,16 +307,16 @@ int hw_sm750_crtc_setMode(struct lynxfb_crtc *crtc,
if (!share->accel_off) { if (!share->accel_off) {
/* set 2d engine pixel format according to mode bpp */ /* set 2d engine pixel format according to mode bpp */
switch (var->bits_per_pixel) { switch (var->bits_per_pixel) {
case 8: case 8:
fmt = 0; fmt = 0;
break; break;
case 16: case 16:
fmt = 1; fmt = 1;
break; break;
case 32: case 32:
default: default:
fmt = 2; fmt = 2;
break; break;
} }
hw_set2dformat(&share->accel, fmt); hw_set2dformat(&share->accel, fmt);
} }
...@@ -427,45 +427,45 @@ int hw_sm750le_setBLANK(struct lynxfb_output *output, int blank) { ...@@ -427,45 +427,45 @@ int hw_sm750le_setBLANK(struct lynxfb_output *output, int blank) {
switch (blank) { switch (blank) {
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 10) #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 10)
case FB_BLANK_UNBLANK: case FB_BLANK_UNBLANK:
#else #else
case VESA_NO_BLANKING: case VESA_NO_BLANKING:
#endif #endif
dpms = CRT_DISPLAY_CTRL_DPMS_0; dpms = CRT_DISPLAY_CTRL_DPMS_0;
crtdb = CRT_DISPLAY_CTRL_BLANK_OFF; crtdb = CRT_DISPLAY_CTRL_BLANK_OFF;
break; break;
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 10) #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 10)
case FB_BLANK_NORMAL: case FB_BLANK_NORMAL:
dpms = CRT_DISPLAY_CTRL_DPMS_0; dpms = CRT_DISPLAY_CTRL_DPMS_0;
crtdb = CRT_DISPLAY_CTRL_BLANK_ON; crtdb = CRT_DISPLAY_CTRL_BLANK_ON;
break; break;
#endif #endif
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 10) #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 10)
case FB_BLANK_VSYNC_SUSPEND: case FB_BLANK_VSYNC_SUSPEND:
#else #else
case VESA_VSYNC_SUSPEND: case VESA_VSYNC_SUSPEND:
#endif #endif
dpms = CRT_DISPLAY_CTRL_DPMS_2; dpms = CRT_DISPLAY_CTRL_DPMS_2;
crtdb = CRT_DISPLAY_CTRL_BLANK_ON; crtdb = CRT_DISPLAY_CTRL_BLANK_ON;
break; break;
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 10) #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 10)
case FB_BLANK_HSYNC_SUSPEND: case FB_BLANK_HSYNC_SUSPEND:
#else #else
case VESA_HSYNC_SUSPEND: case VESA_HSYNC_SUSPEND:
#endif #endif
dpms = CRT_DISPLAY_CTRL_DPMS_1; dpms = CRT_DISPLAY_CTRL_DPMS_1;
crtdb = CRT_DISPLAY_CTRL_BLANK_ON; crtdb = CRT_DISPLAY_CTRL_BLANK_ON;
break; break;
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 10) #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 10)
case FB_BLANK_POWERDOWN: case FB_BLANK_POWERDOWN:
#else #else
case VESA_POWERDOWN: case VESA_POWERDOWN:
#endif #endif
dpms = CRT_DISPLAY_CTRL_DPMS_3; dpms = CRT_DISPLAY_CTRL_DPMS_3;
crtdb = CRT_DISPLAY_CTRL_BLANK_ON; crtdb = CRT_DISPLAY_CTRL_BLANK_ON;
break; break;
default: default:
return -EINVAL; return -EINVAL;
} }
if (output->paths & sm750_crt) { if (output->paths & sm750_crt) {
...@@ -483,50 +483,50 @@ int hw_sm750_setBLANK(struct lynxfb_output *output, int blank) ...@@ -483,50 +483,50 @@ int hw_sm750_setBLANK(struct lynxfb_output *output, int blank)
switch (blank) { switch (blank) {
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 10) #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 10)
case FB_BLANK_UNBLANK: case FB_BLANK_UNBLANK:
#else #else
case VESA_NO_BLANKING: case VESA_NO_BLANKING:
#endif #endif
pr_info("flag = FB_BLANK_UNBLANK \n"); pr_info("flag = FB_BLANK_UNBLANK \n");
dpms = SYSTEM_CTRL_DPMS_VPHP; dpms = SYSTEM_CTRL_DPMS_VPHP;
pps = PANEL_DISPLAY_CTRL_DATA_ENABLE; pps = PANEL_DISPLAY_CTRL_DATA_ENABLE;
crtdb = CRT_DISPLAY_CTRL_BLANK_OFF; crtdb = CRT_DISPLAY_CTRL_BLANK_OFF;
break; break;
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 10) #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 10)
case FB_BLANK_NORMAL: case FB_BLANK_NORMAL:
pr_info("flag = FB_BLANK_NORMAL \n"); pr_info("flag = FB_BLANK_NORMAL \n");
dpms = SYSTEM_CTRL_DPMS_VPHP; dpms = SYSTEM_CTRL_DPMS_VPHP;
pps = PANEL_DISPLAY_CTRL_DATA_DISABLE; pps = PANEL_DISPLAY_CTRL_DATA_DISABLE;
crtdb = CRT_DISPLAY_CTRL_BLANK_ON; crtdb = CRT_DISPLAY_CTRL_BLANK_ON;
break; break;
#endif #endif
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 10) #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 10)
case FB_BLANK_VSYNC_SUSPEND: case FB_BLANK_VSYNC_SUSPEND:
#else #else
case VESA_VSYNC_SUSPEND: case VESA_VSYNC_SUSPEND:
#endif #endif
dpms = SYSTEM_CTRL_DPMS_VNHP; dpms = SYSTEM_CTRL_DPMS_VNHP;
pps = PANEL_DISPLAY_CTRL_DATA_DISABLE; pps = PANEL_DISPLAY_CTRL_DATA_DISABLE;
crtdb = CRT_DISPLAY_CTRL_BLANK_ON; crtdb = CRT_DISPLAY_CTRL_BLANK_ON;
break; break;
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 10) #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 10)
case FB_BLANK_HSYNC_SUSPEND: case FB_BLANK_HSYNC_SUSPEND:
#else #else
case VESA_HSYNC_SUSPEND: case VESA_HSYNC_SUSPEND:
#endif #endif
dpms = SYSTEM_CTRL_DPMS_VPHN; dpms = SYSTEM_CTRL_DPMS_VPHN;
pps = PANEL_DISPLAY_CTRL_DATA_DISABLE; pps = PANEL_DISPLAY_CTRL_DATA_DISABLE;
crtdb = CRT_DISPLAY_CTRL_BLANK_ON; crtdb = CRT_DISPLAY_CTRL_BLANK_ON;
break; break;
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 10) #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 10)
case FB_BLANK_POWERDOWN: case FB_BLANK_POWERDOWN:
#else #else
case VESA_POWERDOWN: case VESA_POWERDOWN:
#endif #endif
dpms = SYSTEM_CTRL_DPMS_VNHN; dpms = SYSTEM_CTRL_DPMS_VNHN;
pps = PANEL_DISPLAY_CTRL_DATA_DISABLE; pps = PANEL_DISPLAY_CTRL_DATA_DISABLE;
crtdb = CRT_DISPLAY_CTRL_BLANK_ON; crtdb = CRT_DISPLAY_CTRL_BLANK_ON;
break; break;
} }
if (output->paths & sm750_crt) { if (output->paths & sm750_crt) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7