---

yaml --- r: 236449 b: refs/heads/master c: 459d2ea h: refs/heads/master i: 236447: 50f08e0 v: v3
git-mirror · Mar 14, 2011 · dda0d1a · dda0d1a
1 parent 88a021f
commit dda0d1a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d0e23bdf3a73b1aff1fe51a71d5e05d89465e2aa
+refs/heads/master: 459d2ea0b5547e55e22c5edff6760ab07c2b3fd1
diff --git a/trunk/drivers/staging/xgifb/vb_util.c b/trunk/drivers/staging/xgifb/vb_util.c
@@ -23,30 +23,30 @@ u8 xgifb_reg_get(unsigned long port, u8 index)
 	return data;
 }
 
-void xgifb_reg_and_or(unsigned long Port, u8 Index,
-		unsigned DataAND, unsigned DataOR)
+void xgifb_reg_and_or(unsigned long port, u8 index,
+		unsigned data_and, unsigned data_or)
 {
 	u8 temp;
 
-	temp = xgifb_reg_get(Port, Index); /* XGINew_Part1Port index 02 */
-	temp = (temp & (DataAND)) | DataOR;
-	xgifb_reg_set(Port, Index, temp);
+	temp = xgifb_reg_get(port, index); /* XGINew_Part1Port index 02 */
+	temp = (temp & data_and) | data_or;
+	xgifb_reg_set(port, index, temp);
 }
 
-void xgifb_reg_and(unsigned long Port, u8 Index, unsigned DataAND)
+void xgifb_reg_and(unsigned long port, u8 index, unsigned data_and)
 {
 	u8 temp;
 
-	temp = xgifb_reg_get(Port, Index); /* XGINew_Part1Port index 02 */
-	temp &= DataAND;
-	xgifb_reg_set(Port, Index, temp);
+	temp = xgifb_reg_get(port, index); /* XGINew_Part1Port index 02 */
+	temp &= data_and;
+	xgifb_reg_set(port, index, temp);
 }
 
-void xgifb_reg_or(unsigned long Port, u8 Index, unsigned DataOR)
+void xgifb_reg_or(unsigned long port, u8 index, unsigned data_or)
 {
 	u8 temp;
 
-	temp = xgifb_reg_get(Port, Index); /* XGINew_Part1Port index 02 */
-	temp |= DataOR;
-	xgifb_reg_set(Port, Index, temp);
+	temp = xgifb_reg_get(port, index); /* XGINew_Part1Port index 02 */
+	temp |= data_or;
+	xgifb_reg_set(port, index, temp);
 }