Commit 4bcdffee authored by Anatoly Stepanov's avatar Anatoly Stepanov Committed by Greg Kroah-Hartman

staging: sm750fb: put open brace on the previous line

Fix open braces according to checkpatch.pl message:
"ERROR: that open brace { should be on the previous line"
Signed-off-by: default avatarAnatoly Stepanov <drivengroove@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e188ea32
...@@ -44,8 +44,7 @@ int hw_sm750_map(struct lynx_share *share, struct pci_dev *pdev) ...@@ -44,8 +44,7 @@ int hw_sm750_map(struct lynx_share *share, struct pci_dev *pdev)
* successfully * successfully
* */ * */
if ((ret = pci_request_region(pdev, 1, "sm750fb"))) if ((ret = pci_request_region(pdev, 1, "sm750fb"))) {
{
pr_err("Can not request PCI regions.\n"); pr_err("Can not request PCI regions.\n");
goto exit; goto exit;
} }
...@@ -78,8 +77,7 @@ int hw_sm750_map(struct lynx_share *share, struct pci_dev *pdev) ...@@ -78,8 +77,7 @@ int hw_sm750_map(struct lynx_share *share, struct pci_dev *pdev)
/* reserve the vidmem space of smi adaptor */ /* reserve the vidmem space of smi adaptor */
#if 0 #if 0
if ((ret = pci_request_region(pdev, 0, _moduleName_))) if ((ret = pci_request_region(pdev, 0, _moduleName_))) {
{
pr_err("Can not request PCI regions.\n"); pr_err("Can not request PCI regions.\n");
goto exit; goto exit;
} }
...@@ -130,8 +128,7 @@ int hw_sm750_inithw(struct lynx_share *share, struct pci_dev *pdev) ...@@ -130,8 +128,7 @@ int hw_sm750_inithw(struct lynx_share *share, struct pci_dev *pdev)
ddk750_initDVIDisp(); ddk750_initDVIDisp();
#endif #endif
if (getChipType() != SM750LE) if (getChipType() != SM750LE) {
{
/* does user need CRT ?*/ /* does user need CRT ?*/
if (spec_share->state.nocrt) { if (spec_share->state.nocrt) {
POKE32(MISC_CTRL, POKE32(MISC_CTRL,
...@@ -177,8 +174,7 @@ int hw_sm750_inithw(struct lynx_share *share, struct pci_dev *pdev) ...@@ -177,8 +174,7 @@ int hw_sm750_inithw(struct lynx_share *share, struct pci_dev *pdev)
/* Customer may NOT use CH7301 DVI chip, which has to be /* Customer may NOT use CH7301 DVI chip, which has to be
initialized differently. initialized differently.
*/ */
if (swI2CReadReg(0xec, 0x4a) == 0x95) if (swI2CReadReg(0xec, 0x4a) == 0x95) {
{
/* The following register values for CH7301 are from /* The following register values for CH7301 are from
Chrontel app note and our experiment. Chrontel app note and our experiment.
*/ */
...@@ -429,8 +425,7 @@ int hw_sm750_setColReg(struct lynxfb_crtc *crtc, ushort index, ...@@ -429,8 +425,7 @@ int hw_sm750_setColReg(struct lynxfb_crtc *crtc, ushort index,
int hw_sm750le_setBLANK(struct lynxfb_output *output, int blank) { int hw_sm750le_setBLANK(struct lynxfb_output *output, int blank) {
int dpms, crtdb; int dpms, crtdb;
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
...@@ -486,8 +481,7 @@ int hw_sm750_setBLANK(struct lynxfb_output *output, int blank) ...@@ -486,8 +481,7 @@ int hw_sm750_setBLANK(struct lynxfb_output *output, int blank)
dpms = pps = crtdb = 0; dpms = pps = crtdb = 0;
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
...@@ -585,8 +579,7 @@ int hw_sm750le_deWait(void) ...@@ -585,8 +579,7 @@ int hw_sm750le_deWait(void)
unsigned int dwVal = PEEK32(DE_STATE2); unsigned int dwVal = PEEK32(DE_STATE2);
if ((FIELD_GET(dwVal, DE_STATE2, DE_STATUS) == DE_STATE2_DE_STATUS_IDLE) && if ((FIELD_GET(dwVal, DE_STATE2, DE_STATUS) == DE_STATE2_DE_STATUS_IDLE) &&
(FIELD_GET(dwVal, DE_STATE2, DE_FIFO) == DE_STATE2_DE_FIFO_EMPTY) && (FIELD_GET(dwVal, DE_STATE2, DE_FIFO) == DE_STATE2_DE_FIFO_EMPTY) &&
(FIELD_GET(dwVal, DE_STATE2, DE_MEM_FIFO) == DE_STATE2_DE_MEM_FIFO_EMPTY)) (FIELD_GET(dwVal, DE_STATE2, DE_MEM_FIFO) == DE_STATE2_DE_MEM_FIFO_EMPTY)) {
{
return 0; return 0;
} }
} }
...@@ -602,8 +595,7 @@ int hw_sm750_deWait(void) ...@@ -602,8 +595,7 @@ int hw_sm750_deWait(void)
unsigned int dwVal = PEEK32(SYSTEM_CTRL); unsigned int dwVal = PEEK32(SYSTEM_CTRL);
if ((FIELD_GET(dwVal, SYSTEM_CTRL, DE_STATUS) == SYSTEM_CTRL_DE_STATUS_IDLE) && if ((FIELD_GET(dwVal, SYSTEM_CTRL, DE_STATUS) == SYSTEM_CTRL_DE_STATUS_IDLE) &&
(FIELD_GET(dwVal, SYSTEM_CTRL, DE_FIFO) == SYSTEM_CTRL_DE_FIFO_EMPTY) && (FIELD_GET(dwVal, SYSTEM_CTRL, DE_FIFO) == SYSTEM_CTRL_DE_FIFO_EMPTY) &&
(FIELD_GET(dwVal, SYSTEM_CTRL, DE_MEM_FIFO) == SYSTEM_CTRL_DE_MEM_FIFO_EMPTY)) (FIELD_GET(dwVal, SYSTEM_CTRL, DE_MEM_FIFO) == SYSTEM_CTRL_DE_MEM_FIFO_EMPTY)) {
{
return 0; return 0;
} }
} }
......
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