From dda0d1aa6b1defba20251ba09654df94d108c2d5 Mon Sep 17 00:00:00 2001 From: Aaro Koskinen Date: Sun, 13 Mar 2011 12:26:28 +0200 Subject: [PATCH] --- yaml --- r: 236449 b: refs/heads/master c: 459d2ea0b5547e55e22c5edff6760ab07c2b3fd1 h: refs/heads/master i: 236447: 50f08e01ec5580ea538569ef1349624b6d55ad7e v: v3 --- [refs] | 2 +- trunk/drivers/staging/xgifb/vb_util.c | 26 +++++++++++++------------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/[refs] b/[refs] index 6d17d4e9437c..af421b79afa1 100644 --- 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 index 19bcdab8debe..a97e44f98c08 100644 --- 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); }