linux-kernel - [PATCH 05/12] staging: xgifb: replace andXGIIDXREG() with xgifb_reg

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <1303154048-21989-6-git-send-email-aaro.koskinen@iki.fi>
Date:	Mon, 18 Apr 2011 22:14:01 +0300
From:	Aaro Koskinen <aaro.koskinen@....fi>
To:	gregkh@...e.de, devel@...verdev.osuosl.org,
	linux-kernel@...r.kernel.org, arnaud.patard@...-net.org
Subject: [PATCH 05/12] staging: xgifb: replace andXGIIDXREG() with xgifb_reg_and()

Replace andXGIIDXREG() with xgifb_reg_and().

Signed-off-by: Aaro Koskinen <aaro.koskinen@....fi>
---
 drivers/staging/xgifb/XGI_main_26.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/staging/xgifb/XGI_main_26.c b/drivers/staging/xgifb/XGI_main_26.c
index 2f2c275..1dacd52 100644
--- a/drivers/staging/xgifb/XGI_main_26.c
+++ b/drivers/staging/xgifb/XGI_main_26.c
@@ -1936,7 +1936,7 @@ static void XGIfb_post_setmode(void)
 		reg |= 0x80;
 	xgifb_reg_set(XGICR, 0x17, reg);
 
-	andXGIIDXREG(XGISR, IND_XGI_RAMDAC_CONTROL, ~0x04);
+	xgifb_reg_and(XGISR, IND_XGI_RAMDAC_CONTROL, ~0x04);
 
 	if ((xgi_video_info.disp_state & DISPTYPE_TV) && (xgi_video_info.hasVB
 			== HASVB_301)) {
@@ -1967,11 +1967,11 @@ static void XGIfb_post_setmode(void)
 
 			if (xgi_video_info.TV_type == TVMODE_NTSC) {
 
-				andXGIIDXREG(XGIPART2, 0x3a, 0x1f);
+				xgifb_reg_and(XGIPART2, 0x3a, 0x1f);
 
 				if (xgi_video_info.TV_plug == TVPLUG_SVIDEO) {
 
-					andXGIIDXREG(XGIPART2, 0x30, 0xdf);
+					xgifb_reg_and(XGIPART2, 0x30, 0xdf);
 
 				} else if (xgi_video_info.TV_plug
 						== TVPLUG_COMPOSITE) {
@@ -2002,11 +2002,11 @@ static void XGIfb_post_setmode(void)
 
 			} else if (xgi_video_info.TV_type == TVMODE_PAL) {
 
-				andXGIIDXREG(XGIPART2, 0x3A, 0x1F);
+				xgifb_reg_and(XGIPART2, 0x3A, 0x1F);
 
 				if (xgi_video_info.TV_plug == TVPLUG_SVIDEO) {
 
-					andXGIIDXREG(XGIPART2, 0x30, 0xDF);
+					xgifb_reg_and(XGIPART2, 0x30, 0xDF);
 
 				} else if (xgi_video_info.TV_plug
 						== TVPLUG_COMPOSITE) {
-- 
1.5.6.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/