Merge remote-tracking branch 'staging/staging-next'

[deliverable/linux.git] / drivers / staging / sm750fb / ddk750_display.c

diff --git a/drivers/staging/sm750fb/ddk750_display.c b/drivers/staging/sm750fb/ddk750_display.c
index ca4973ee49e4204780026434071c4220b1d2af6d..a040042aabff39fb41319e44742f737a1534d17b 100644 (file)
--- a/drivers/staging/sm750fb/ddk750_display.c
+++ b/drivers/staging/sm750fb/ddk750_display.c
@@ -68,8 +68,10 @@ static void waitNextVerticalSync(int ctrl, int delay)
        if (!ctrl) {
                /* primary controller */
 
-               /* Do not wait when the Primary PLL is off or display control is already off.
-                  This will prevent the software to wait forever. */
+               /*
+                * Do not wait when the Primary PLL is off or display control is
+                * already off. This will prevent the software to wait forever.
+                */
                if (!(PEEK32(PANEL_PLL_CTRL) & PLL_CTRL_POWER) ||
                    !(PEEK32(PANEL_DISPLAY_CTRL) & DISPLAY_CTRL_TIMING)) {
                        return;
@@ -88,9 +90,10 @@ static void waitNextVerticalSync(int ctrl, int delay)
                }
 
        } else {
-
-               /* Do not wait when the Primary PLL is off or display control is already off.
-                          This will prevent the software to wait forever. */
+               /*
+                * Do not wait when the Primary PLL is off or display control is
+                * already off. This will prevent the software to wait forever.
+                */
                if (!(PEEK32(CRT_PLL_CTRL) & PLL_CTRL_POWER) ||
                    !(PEEK32(CRT_DISPLAY_CTRL) & DISPLAY_CTRL_TIMING)) {
                        return;