staging: xgifb: clean up register access types

Make type usage consistent. Use u8 for HW registers and unsigned for
bitmasks.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/xgifb/vb_util.c b/drivers/staging/xgifb/vb_util.c
index d8429e836e859f6d0a7364d1c484c30cbe7804e9..19bcdab8debee362e62ff43ba4f20c1fe521c611 100644 (file)
--- a/drivers/staging/xgifb/vb_util.c
+++ b/drivers/staging/xgifb/vb_util.c
@@ -8,46 +8,43 @@
 
 #include "vb_util.h"
 
-void xgifb_reg_set(unsigned long port, unsigned short index,
-               unsigned short data)
+void xgifb_reg_set(unsigned long port, u8 index, u8 data)
 {
        outb(index, port);
        outb(data, port + 1);
 }
 
-unsigned char xgifb_reg_get(unsigned long port, unsigned short index)
+u8 xgifb_reg_get(unsigned long port, u8 index)
 {
-       unsigned char data;
+       u8 data;
 
        outb(index, port);
        data = inb(port + 1);
        return data;
 }
 
-void xgifb_reg_and_or(unsigned long Port, unsigned short Index,
-               unsigned short DataAND, unsigned short DataOR)
+void xgifb_reg_and_or(unsigned long Port, u8 Index,
+               unsigned DataAND, unsigned DataOR)
 {
-       unsigned short temp;
+       u8 temp;
 
        temp = xgifb_reg_get(Port, Index); /* XGINew_Part1Port index 02 */
        temp = (temp & (DataAND)) | DataOR;
        xgifb_reg_set(Port, Index, temp);
 }
 
-void xgifb_reg_and(unsigned long Port, unsigned short Index,
-               unsigned short DataAND)
+void xgifb_reg_and(unsigned long Port, u8 Index, unsigned DataAND)
 {
-       unsigned short temp;
+       u8 temp;
 
        temp = xgifb_reg_get(Port, Index); /* XGINew_Part1Port index 02 */
        temp &= DataAND;
        xgifb_reg_set(Port, Index, temp);
 }
 
-void xgifb_reg_or(unsigned long Port, unsigned short Index,
-               unsigned short DataOR)
+void xgifb_reg_or(unsigned long Port, u8 Index, unsigned DataOR)
 {
-       unsigned short temp;
+       u8 temp;
 
        temp = xgifb_reg_get(Port, Index); /* XGINew_Part1Port index 02 */
        temp |= DataOR;

diff --git a/drivers/staging/xgifb/vb_util.h b/drivers/staging/xgifb/vb_util.h
index 98af1c0eaa42754811c421aaadbabad3a0cb4e2a..9161de1d37ddbde59629cd35687c5c3526fc34f7 100644 (file)
--- a/drivers/staging/xgifb/vb_util.h
+++ b/drivers/staging/xgifb/vb_util.h
@@ -1,9 +1,9 @@
 #ifndef _VBUTIL_
 #define _VBUTIL_
-extern void xgifb_reg_set(unsigned long, unsigned short, unsigned short);
-extern unsigned char xgifb_reg_get(unsigned long, unsigned short);
-extern void xgifb_reg_or(unsigned long, unsigned short, unsigned short);
-extern void xgifb_reg_and(unsigned long, unsigned short, unsigned short);
-extern void xgifb_reg_and_or(unsigned long, unsigned short, unsigned short, unsigned short);
+extern void xgifb_reg_set(unsigned long, u8, u8);
+extern u8 xgifb_reg_get(unsigned long, u8);
+extern void xgifb_reg_or(unsigned long, u8, unsigned);
+extern void xgifb_reg_and(unsigned long, u8, unsigned);
+extern void xgifb_reg_and_or(unsigned long, u8, unsigned, unsigned);
 #endif