Merge tag 'random_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel...

[karo-tx-linux.git] / drivers / staging / xgifb / vb_init.c

diff --git a/drivers/staging/xgifb/vb_init.c b/drivers/staging/xgifb/vb_init.c
index 26b539bc6fafd728bc653a3db72f7bf508b01816..062ece22ed84c6aa4436e8c5c0dc109ced2b738f 100644 (file)
--- a/drivers/staging/xgifb/vb_init.c
+++ b/drivers/staging/xgifb/vb_init.c
@@ -355,7 +355,8 @@ static void XGINew_DDR2_DefaultRegister(
        unsigned long P3d4 = Port, P3c4 = Port - 0x10;
 
        /* keep following setting sequence, each setting in
-        * the same reg insert idle */
+        * the same reg insert idle
+        */
        xgifb_reg_set(P3d4, 0x82, 0x77);
        xgifb_reg_set(P3d4, 0x86, 0x00);
        xgifb_reg_get(P3d4, 0x86); /* Insert read command for delay */
@@ -551,7 +552,8 @@ static int XGINew_ReadWriteRest(unsigned short StopAddr,
                writel(Position, fbaddr + Position);
        }
 
-       usleep_range(500, 1500); /* Fix #1759 Memory Size error in Multi-Adapter. */
+       /* Fix #1759 Memory Size error in Multi-Adapter. */
+       usleep_range(500, 1500);
 
        Position = 0;
 
@@ -699,11 +701,11 @@ static void XGINew_CheckChannel(struct xgi_hw_device_info *HwDeviceExtension,
                break;
        case XG42:
                /*
-                XG42 SR14 D[3] Reserve
-                D[2] = 1, Dual Channel
-                = 0, Single Channel
-
-                It's Different from Other XG40 Series.
+                * XG42 SR14 D[3] Reserve
+                * D[2] = 1, Dual Channel
+                * = 0, Single Channel
+                *
+                * It's Different from Other XG40 Series.
                 */
                if (XGINew_CheckFrequence(pVBInfo) == 1) { /* DDRII, DDR2x */
                        pVBInfo->ram_bus = 32; /* 32 bits */