renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-27 14:43:58 +08:00
Code

staging: xgifb: replace andXGIIDXREG() with xgifb_reg_and()

Browse Source 
Replace andXGIIDXREG() with xgifb_reg_and().

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Aaro Koskinen 2011-04-18 22:14:01 +03:00 committed by Greg Kroah-Hartman
parent e67f4d4d9e
commit b2135e4460
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/staging/xgifb/XGI_main_26.c
View File

@ -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) {