From 863c02af581e0d1b0cf57e9f3b785572bcfcd980 Mon Sep 17 00:00:00 2001 From: Aaro Koskinen Date: Tue, 13 Sep 2011 22:49:31 +0300 Subject: 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] * 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] *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] *addr drivers/staging/xgifb/XGI_main_26.c:2463:31: got char *[addressable] [toplevel] [assigned] mmio_vbase Signed-off-by: Aaro Koskinen Signed-off-by: Greg Kroah-Hartman --- drivers/staging/xgifb/XGIfb.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/staging/xgifb/XGIfb.h') diff --git a/drivers/staging/xgifb/XGIfb.h b/drivers/staging/xgifb/XGIfb.h index 5d81cb69e63c..12e1a3e330b7 100644 --- a/drivers/staging/xgifb/XGIfb.h +++ b/drivers/staging/xgifb/XGIfb.h @@ -59,7 +59,7 @@ struct video_info { char *video_vbase; unsigned long mmio_base; unsigned long mmio_size; - char *mmio_vbase; + void __iomem *mmio_vbase; unsigned long vga_base; unsigned long mtrr; -- cgit v1.2.3-59-g8ed1b