diff options
| author | Aaro Koskinen | 2011-09-13 21:49:33 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2011-09-16 20:16:48 +0200 |
| commit | c44fa627c7b351cb359b7bd373756776b907ecd5 (patch) | |
| tree | 0df5300ac4eae6985555bcf3c0f54de280510b51 /drivers/staging/xgifb/vb_struct.h | |
| parent | staging: xgifb: unify #include order (diff) | |
| download | kernel-qcow2-linux-c44fa627c7b351cb359b7bd373756776b907ecd5.tar.gz kernel-qcow2-linux-c44fa627c7b351cb359b7bd373756776b907ecd5.tar.xz kernel-qcow2-linux-c44fa627c7b351cb359b7bd373756776b907ecd5.zip | |
staging: xgifb: vb_init: use readl()/writel() to access iomapped memory
Use readl() and writel() in FB memory test instead of direct pointer
access, and also add iomem annotations for the FB memory.
The patch eliminates the following sparse warnings:
drivers/staging/xgifb/XGI_main_26.c:2113:69: warning: incorrect type in assignment (different address spaces)
drivers/staging/xgifb/XGI_main_26.c:2113:69: expected unsigned char *static [addressable] [toplevel] [assigned] pjVideoMemoryAddress
drivers/staging/xgifb/XGI_main_26.c:2113:69: got void [noderef] <asn:2>*
drivers/staging/xgifb/XGI_main_26.c:2399:30: warning: incorrect type in assignment (different address spaces)
drivers/staging/xgifb/XGI_main_26.c:2399:30: expected char [noderef] <asn:2>*screen_base
drivers/staging/xgifb/XGI_main_26.c:2399:30: got char *[addressable] [toplevel] [assigned] video_vbase
drivers/staging/xgifb/XGI_main_26.c:2430:31: warning: incorrect type in argument 1 (different address spaces)
drivers/staging/xgifb/XGI_main_26.c:2430:31: expected void volatile [noderef] <asn:2>*addr
drivers/staging/xgifb/XGI_main_26.c:2430:31: got char *[addressable] [toplevel] [assigned] video_vbase
drivers/staging/xgifb/XGI_main_26.c:2454:31: warning: incorrect type in argument 1 (different address spaces)
drivers/staging/xgifb/XGI_main_26.c:2454:31: expected void volatile [noderef] <asn:2>*addr
drivers/staging/xgifb/XGI_main_26.c:2454:31: got char *[addressable] [toplev
Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/xgifb/vb_struct.h')
| -rw-r--r-- | drivers/staging/xgifb/vb_struct.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/xgifb/vb_struct.h b/drivers/staging/xgifb/vb_struct.h index 6f13442bd6aa..860c98649bff 100644 --- a/drivers/staging/xgifb/vb_struct.h +++ b/drivers/staging/xgifb/vb_struct.h @@ -300,7 +300,7 @@ struct vb_device_info { unsigned short SelectCRT2Rate; unsigned char *ROMAddr; - unsigned char *FBAddr; + void __iomem *FBAddr; unsigned long BaseAddr; unsigned long RelIO; |