summaryrefslogtreecommitdiff
path: root/drivers/staging/xgifb
diff options
context:
space:
mode:
authorAaro Koskinen <aaro.koskinen@iki.fi>2011-04-18 22:14:01 +0300
committerGreg Kroah-Hartman <gregkh@suse.de>2011-04-25 17:26:27 -0700
commitb2135e4460892b07068550b5def6ba08e87e61fd (patch)
tree98d84ea81befbe7f8a01d5da395905a190c4a835 /drivers/staging/xgifb
parente67f4d4d9e330710b84a6bfe500c713059a7868b (diff)
staging: xgifb: replace andXGIIDXREG() with xgifb_reg_and()
Replace andXGIIDXREG() with xgifb_reg_and(). Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/xgifb')
-rw-r--r--drivers/staging/xgifb/XGI_main_26.c10
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 2f2c2753debe..1dacd52825ed 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) {