aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/xgifb/XGIfb.h
diff options
context:
space:
mode:
authorAaro Koskinen <aaro.koskinen@iki.fi>2011-09-13 15:49:31 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2011-09-16 14:16:47 -0400
commit863c02af581e0d1b0cf57e9f3b785572bcfcd980 (patch)
treea6ac67821c0c076ce76a41653827f8e7fcde6092 /drivers/staging/xgifb/XGIfb.h
parentd15cce50161bbb46236f9c50ab044c795cbbecc0 (diff)
staging: xgifb: main: use readb()/readw() to access iomapped memory
Use readb()/readw() instead of direct pointer access to read I/O mapped memory and also add __iomem annotation. The patch eliminates the following sparse warnings: drivers/staging/xgifb/XGI_main_26.c:2125:35: warning: incorrect type in assignment (different address spaces) drivers/staging/xgifb/XGI_main_26.c:2125:35: expected char *[addressable] [toplevel] [assigned] mmio_vbase drivers/staging/xgifb/XGI_main_26.c:2125:35: got void [noderef] <asn:2>* drivers/staging/xgifb/XGI_main_26.c:2439:31: warning: incorrect type in argument 1 (different address spaces) drivers/staging/xgifb/XGI_main_26.c:2439:31: expected void volatile [noderef] <asn:2>*addr drivers/staging/xgifb/XGI_main_26.c:2439:31: got char *[addressable] [toplevel] [assigned] mmio_vbase drivers/staging/xgifb/XGI_main_26.c:2463:31: warning: incorrect type in argument 1 (different address spaces) drivers/staging/xgifb/XGI_main_26.c:2463:31: expected void volatile [noderef] <asn:2>*addr drivers/staging/xgifb/XGI_main_26.c:2463:31: got char *[addressable] [toplevel] [assigned] mmio_vbase Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/xgifb/XGIfb.h')
-rw-r--r--drivers/staging/xgifb/XGIfb.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/xgifb/XGIfb.h b/drivers/staging/xgifb/XGIfb.h
index 5d81cb69e63..12e1a3e330b 100644
--- a/drivers/staging/xgifb/XGIfb.h
+++ b/drivers/staging/xgifb/XGIfb.h
@@ -59,7 +59,7 @@ struct video_info {
59 char *video_vbase; 59 char *video_vbase;
60 unsigned long mmio_base; 60 unsigned long mmio_base;
61 unsigned long mmio_size; 61 unsigned long mmio_size;
62 char *mmio_vbase; 62 void __iomem *mmio_vbase;
63 unsigned long vga_base; 63 unsigned long vga_base;
64 unsigned long mtrr; 64 unsigned long mtrr;
65 65