staging: sm7xxfb: annotate iomem pointers

This patch annotates iomem pointers.

Signed-off-by: Javier M. Mellid <jmunhoz@igalia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/sm7xxfb/sm7xx.h b/drivers/staging/sm7xxfb/sm7xx.h
index 333f33c3dc6685ceb20c9bdfbfb8a37c7f03b00d..85998615b80149a73d59232d31c87768c254ed3e 100644 (file)
--- a/drivers/staging/sm7xxfb/sm7xx.h
+++ b/drivers/staging/sm7xxfb/sm7xx.h
@@ -29,7 +29,7 @@
 #define dac_reg        (0x3c8)
 #define dac_val        (0x3c9)
 
-extern char __iomem *smtc_RegBaseAddress;
+extern void __iomem *smtc_RegBaseAddress;
 #define smtc_mmiowb(dat, reg)  writeb(dat, smtc_RegBaseAddress + reg)
 #define smtc_mmioww(dat, reg)  writew(dat, smtc_RegBaseAddress + reg)
 #define smtc_mmiowl(dat, reg)  writel(dat, smtc_RegBaseAddress + reg)

diff --git a/drivers/staging/sm7xxfb/sm7xxfb.c b/drivers/staging/sm7xxfb/sm7xxfb.c
index 5ad52b9204b0579e1d8583e68e6b4e0a0e6b0271..3fa55a8186ed4fb40c8f597c019b27cf1e5ebdf3 100644 (file)
--- a/drivers/staging/sm7xxfb/sm7xxfb.c
+++ b/drivers/staging/sm7xxfb/sm7xxfb.c
@@ -43,11 +43,11 @@ struct smtcfb_info {
        u16 chip_id;
        u8  chip_rev_id;
 
-       unsigned char __iomem *m_pMMIO;
-       char __iomem *m_pLFB;
-       char *m_pDPR;
-       char *m_pVPR;
-       char *m_pCPR;
+       void __iomem *m_pMMIO;
+       void __iomem *m_pLFB;
+       void __iomem *m_pDPR;
+       void __iomem *m_pVPR;
+       void __iomem *m_pCPR;
 
        u_int width;
        u_int height;
@@ -56,8 +56,8 @@ struct smtcfb_info {
        u32 colreg[17];
 };
 
-char __iomem *smtc_RegBaseAddress;     /* Memory Map IO starting address */
-char __iomem *smtc_VRAMBaseAddress;    /* video memory starting address */
+void __iomem *smtc_RegBaseAddress;     /* Memory Map IO starting address */
+void __iomem *smtc_VRAMBaseAddress;    /* video memory starting address */
 
 static struct fb_var_screeninfo smtcfb_var = {
        .xres           = 1024,