diff options
| author | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2010-04-17 19:44:54 +0000 |
|---|---|---|
| committer | Jonathan Corbet <corbet@lwn.net> | 2010-05-07 17:17:39 -0600 |
| commit | 384c3041aeaf77d299b0d4a62481850fed86e53b (patch) | |
| tree | 9be5fb948e7d4aa6c35d874ede023b64a582cbe8 /drivers/video/via | |
| parent | 100e74a150d3a31d4c12658c926429ceb880d2f7 (diff) | |
| download | linux-stable-384c3041aeaf77d299b0d4a62481850fed86e53b.tar.gz linux-stable-384c3041aeaf77d299b0d4a62481850fed86e53b.tar.bz2 linux-stable-384c3041aeaf77d299b0d4a62481850fed86e53b.zip | |
viafb: replace inb/outb
viafb: replace inb/outb
This patch replaces occurences of inb/outb with via_write_reg and
via_write_reg_mask where this is possible to improve code
readability.
Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Diffstat (limited to 'drivers/video/via')
| -rw-r--r-- | drivers/video/via/hw.c | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/drivers/video/via/hw.c b/drivers/video/via/hw.c index d474fbee3350..b2bb24e23f33 100644 --- a/drivers/video/via/hw.c +++ b/drivers/video/via/hw.c @@ -1008,16 +1008,12 @@ void viafb_load_reg(int timing_value, int viafb_load_reg_num, void viafb_write_regx(struct io_reg RegTable[], int ItemNum) { int i; - unsigned char RegTemp; /*DEBUG_MSG(KERN_INFO "Table Size : %x!!\n",ItemNum ); */ - for (i = 0; i < ItemNum; i++) { - outb(RegTable[i].index, RegTable[i].port); - RegTemp = inb(RegTable[i].port + 1); - RegTemp = (RegTemp & (~RegTable[i].mask)) | RegTable[i].value; - outb(RegTemp, RegTable[i].port + 1); - } + for (i = 0; i < ItemNum; i++) + via_write_reg_mask(RegTable[i].port, RegTable[i].index, + RegTable[i].value, RegTable[i].mask); } void viafb_load_fetch_count_reg(int h_addr, int bpp_byte, int set_iga) @@ -2130,10 +2126,8 @@ int viafb_setmode(struct VideoModeTable *vmode_tbl, int video_bpp, outb(VPIT.Misc, VIAWMisc); /* Write Sequencer */ - for (i = 1; i <= StdSR; i++) { - outb(i, VIASR); - outb(VPIT.SR[i - 1], VIASR + 1); - } + for (i = 1; i <= StdSR; i++) + via_write_reg(VIASR, i, VPIT.SR[i - 1]); viafb_write_reg_mask(0x15, VIASR, 0xA2, 0xA2); viafb_set_iga_path(); @@ -2142,10 +2136,8 @@ int viafb_setmode(struct VideoModeTable *vmode_tbl, int video_bpp, viafb_fill_crtc_timing(crt_timing, vmode_tbl, video_bpp / 8, IGA1); /* Write Graphic Controller */ - for (i = 0; i < StdGR; i++) { - outb(i, VIAGR); - outb(VPIT.GR[i], VIAGR + 1); - } + for (i = 0; i < StdGR; i++) + via_write_reg(VIAGR, i, VPIT.GR[i]); /* Write Attribute Controller */ for (i = 0; i < StdAR; i++) { |