Commit 5e83e283 authored by Anatoly Stepanov's avatar Anatoly Stepanov Committed by Greg Kroah-Hartman

staging: sm750fb: fix indentation in 'else' statements

Fix indentation according to checkpatch.pl message:
"ERROR: space required after that close brace '}'"
Signed-off-by: default avatarAnatoly Stepanov <drivengroove@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4bcdffee
...@@ -55,7 +55,7 @@ int hw_sm750_map(struct lynx_share *share, struct pci_dev *pdev) ...@@ -55,7 +55,7 @@ int hw_sm750_map(struct lynx_share *share, struct pci_dev *pdev)
pr_err("mmio failed\n"); pr_err("mmio failed\n");
ret = -EFAULT; ret = -EFAULT;
goto exit; goto exit;
}else{ } else {
pr_info("mmio virtual addr = %p\n", share->pvReg); pr_info("mmio virtual addr = %p\n", share->pvReg);
} }
...@@ -89,7 +89,7 @@ int hw_sm750_map(struct lynx_share *share, struct pci_dev *pdev) ...@@ -89,7 +89,7 @@ int hw_sm750_map(struct lynx_share *share, struct pci_dev *pdev)
pr_err("Map video memory failed\n"); pr_err("Map video memory failed\n");
ret = -EFAULT; ret = -EFAULT;
goto exit; goto exit;
}else{ } else {
pr_info("video memory vaddr = %p\n", share->pvMem); pr_info("video memory vaddr = %p\n", share->pvMem);
} }
exit: exit:
...@@ -140,7 +140,7 @@ int hw_sm750_inithw(struct lynx_share *share, struct pci_dev *pdev) ...@@ -140,7 +140,7 @@ int hw_sm750_inithw(struct lynx_share *share, struct pci_dev *pdev)
FIELD_SET(PEEK32(SYSTEM_CTRL), FIELD_SET(PEEK32(SYSTEM_CTRL),
SYSTEM_CTRL, SYSTEM_CTRL,
DPMS, VNHN)); DPMS, VNHN));
}else{ } else {
POKE32(MISC_CTRL, POKE32(MISC_CTRL,
FIELD_SET(PEEK32(MISC_CTRL), FIELD_SET(PEEK32(MISC_CTRL),
MISC_CTRL, MISC_CTRL,
...@@ -163,7 +163,7 @@ int hw_sm750_inithw(struct lynx_share *share, struct pci_dev *pdev) ...@@ -163,7 +163,7 @@ int hw_sm750_inithw(struct lynx_share *share, struct pci_dev *pdev)
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 */
/* Set up GPIO for software I2C to program DVI chip in the /* Set up GPIO for software I2C to program DVI chip in the
Xilinx SP605 board, in order to have video signal. Xilinx SP605 board, in order to have video signal.
...@@ -232,7 +232,7 @@ int hw_sm750_output_setMode(struct lynxfb_output *output, ...@@ -232,7 +232,7 @@ int hw_sm750_output_setMode(struct lynxfb_output *output,
if (output->paths & sm750_crt) if (output->paths & sm750_crt)
dispSet |= do_CRT_PRI; dispSet |= do_CRT_PRI;
}else{ } else {
pr_info("secondary channel\n"); pr_info("secondary channel\n");
if (output->paths & sm750_panel) if (output->paths & sm750_panel)
dispSet |= do_LCD1_SEC; dispSet |= do_LCD1_SEC;
...@@ -241,7 +241,7 @@ int hw_sm750_output_setMode(struct lynxfb_output *output, ...@@ -241,7 +241,7 @@ int hw_sm750_output_setMode(struct lynxfb_output *output,
} }
ddk750_setLogicalDispOut(dispSet); ddk750_setLogicalDispOut(dispSet);
}else{ } else {
/* just open DISPLAY_CONTROL_750LE register bit 3:0*/ /* just open DISPLAY_CONTROL_750LE register bit 3:0*/
u32 reg; u32 reg;
reg = PEEK32(DISPLAY_CONTROL_750LE); reg = PEEK32(DISPLAY_CONTROL_750LE);
...@@ -385,7 +385,7 @@ int hw_sm750_crtc_setMode(struct lynxfb_crtc *crtc, ...@@ -385,7 +385,7 @@ int hw_sm750_crtc_setMode(struct lynxfb_crtc *crtc,
PANEL_DISPLAY_CTRL, FORMAT, PANEL_DISPLAY_CTRL, FORMAT,
(var->bits_per_pixel >> 4) (var->bits_per_pixel >> 4)
)); ));
}else{ } else {
/* not implemented now */ /* not implemented now */
POKE32(CRT_FB_ADDRESS, crtc->oScreen); POKE32(CRT_FB_ADDRESS, crtc->oScreen);
reg = var->xres * (var->bits_per_pixel >> 3); reg = var->xres * (var->bits_per_pixel >> 3);
...@@ -557,7 +557,7 @@ void hw_sm750_initAccel(struct lynx_share *share) ...@@ -557,7 +557,7 @@ void hw_sm750_initAccel(struct lynx_share *share)
reg = FIELD_SET(reg, DE_STATE1, DE_ABORT, OFF); reg = FIELD_SET(reg, DE_STATE1, DE_ABORT, OFF);
POKE32(DE_STATE1, reg); POKE32(DE_STATE1, reg);
}else{ } else {
/* engine reset */ /* engine reset */
reg = PEEK32(SYSTEM_CTRL); reg = PEEK32(SYSTEM_CTRL);
reg = FIELD_SET(reg, SYSTEM_CTRL, DE_ABORT, ON); reg = FIELD_SET(reg, SYSTEM_CTRL, DE_ABORT, ON);
......
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