[PATCH] aac7xxx iomem annotations

aic7xxx annotations - trivial part

Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/drivers/scsi/aic7xxx/aic79xx_osm.h b/drivers/scsi/aic7xxx/aic79xx_osm.h
index 5122ecfb8db49c06d1ed345fb7411646615f012b..5fee4636053458a11517c961c147ce6e28bd73a6 100644 (file)
--- a/drivers/scsi/aic7xxx/aic79xx_osm.h
+++ b/drivers/scsi/aic7xxx/aic79xx_osm.h
@@ -145,7 +145,7 @@ typedef enum {
 
 typedef union {
        u_long            ioport;
-       volatile uint8_t *maddr;
+       volatile uint8_t __iomem *maddr;
 } bus_space_handle_t;
 
 typedef struct bus_dma_segment

diff --git a/drivers/scsi/aic7xxx/aic79xx_osm_pci.c b/drivers/scsi/aic7xxx/aic79xx_osm_pci.c
index 1830288ec0d19f6c677bada0e2602e70e2b40ebd..71a435b5b02c733a964999fe0750e2fb64d5a8e4 100644 (file)
--- a/drivers/scsi/aic7xxx/aic79xx_osm_pci.c
+++ b/drivers/scsi/aic7xxx/aic79xx_osm_pci.c
@@ -49,7 +49,7 @@ static int    ahd_linux_pci_reserve_io_regions(struct ahd_softc *ahd,
                                                 u_long *base, u_long *base2);
 static int     ahd_linux_pci_reserve_mem_region(struct ahd_softc *ahd,
                                                 u_long *bus_addr,
-                                                uint8_t **maddr);
+                                                uint8_t __iomem **maddr);
 static void    ahd_linux_pci_dev_remove(struct pci_dev *pdev);
 
 /* Define the macro locally since it's different for different class of chips.
@@ -245,7 +245,7 @@ ahd_linux_pci_reserve_io_regions(struct ahd_softc *ahd, u_long *base,
 static int
 ahd_linux_pci_reserve_mem_region(struct ahd_softc *ahd,
                                 u_long *bus_addr,
-                                uint8_t **maddr)
+                                uint8_t __iomem **maddr)
 {
        u_long  start;
        u_long  base_page;
@@ -284,7 +284,7 @@ ahd_pci_map_registers(struct ahd_softc *ahd)
 {
        uint32_t command;
        u_long   base;
-       uint8_t *maddr;
+       uint8_t __iomem *maddr;
        int      error;
 
        /*

diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm.h b/drivers/scsi/aic7xxx/aic7xxx_osm.h
index f86791585c9777893450f3f1768acdf960f84cc8..51c4aaceb83dc45cf44ffe1e781ba6863d5cb23f 100644 (file)
--- a/drivers/scsi/aic7xxx/aic7xxx_osm.h
+++ b/drivers/scsi/aic7xxx/aic7xxx_osm.h
@@ -157,7 +157,7 @@ typedef enum {
 
 typedef union {
        u_long            ioport;
-       volatile uint8_t *maddr;
+       volatile uint8_t __iomem *maddr;
 } bus_space_handle_t;
 
 typedef struct bus_dma_segment

diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c b/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c
index e57654ba76eba239b2246080b18952bd649d9df6..b335c7db124603829841a202ba03300e23cfd5cc 100644 (file)
--- a/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c
+++ b/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c
@@ -54,7 +54,7 @@ static int    ahc_linux_pci_reserve_io_region(struct ahc_softc *ahc,
                                                u_long *base);
 static int     ahc_linux_pci_reserve_mem_region(struct ahc_softc *ahc,
                                                 u_long *bus_addr,
-                                                uint8_t **maddr);
+                                                uint8_t __iomem **maddr);
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
 static void    ahc_linux_pci_dev_remove(struct pci_dev *pdev);
 
@@ -326,7 +326,7 @@ ahc_linux_pci_reserve_io_region(struct ahc_softc *ahc, u_long *base)
 static int
 ahc_linux_pci_reserve_mem_region(struct ahc_softc *ahc,
                                 u_long *bus_addr,
-                                uint8_t **maddr)
+                                uint8_t __iomem **maddr)
 {
        u_long  start;
        u_long  base_page;
@@ -370,7 +370,7 @@ ahc_pci_map_registers(struct ahc_softc *ahc)
 {
        uint32_t command;
        u_long   base;
-       uint8_t *maddr;
+       uint8_t __iomem *maddr;
        int      error;
 
        /*