[PATCH] fusion iomem annotations

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

diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
index 2ba74dcae285b0447fbe2d5ac9f8278fa40dbfef..6c20dc37f558aed21db9117b65cf89c31b8e5657 100644 (file)
--- a/drivers/message/fusion/mptbase.c
+++ b/drivers/message/fusion/mptbase.c
@@ -1096,7 +1096,7 @@ static int __devinit
 mptbase_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 {
        MPT_ADAPTER     *ioc;
-       u8              *mem;
+       u8              __iomem *mem;
        unsigned long    mem_phys;
        unsigned long    port;
        u32              msize;
@@ -1211,13 +1211,13 @@ mptbase_probe(struct pci_dev *pdev, const struct pci_device_id *id)
                        &ioc->facts, &ioc->pfacts[0]));
 
        ioc->mem_phys = mem_phys;
-       ioc->chip = (SYSIF_REGS*)mem;
+       ioc->chip = (SYSIF_REGS __iomem *)mem;
 
        /* Save Port IO values in case we need to do downloadboot */
        {
                u8 *pmem = (u8*)port;
                ioc->pio_mem_phys = port;
-               ioc->pio_chip = (SYSIF_REGS*)pmem;
+               ioc->pio_chip = (SYSIF_REGS __iomem *)pmem;
        }
 
        ioc->chip_type = FCUNK;
@@ -2000,7 +2000,7 @@ mpt_adapter_dispose(MPT_ADAPTER *ioc)
                }
 
                if (ioc->memmap != NULL)
-                       iounmap((u8 *) ioc->memmap);
+                       iounmap(ioc->memmap);
 
 #if defined(CONFIG_MTRR) && 0
                if (ioc->mtrr_reg > 0) {

diff --git a/drivers/message/fusion/mptbase.h b/drivers/message/fusion/mptbase.h
index a1a9ab8dc7fb11c9f80d8a0b8f67cfcc7f81ea84..1e37574c7a6b3dfe6955e7b47251ac7fdf79e43a 100644 (file)
--- a/drivers/message/fusion/mptbase.h
+++ b/drivers/message/fusion/mptbase.h
@@ -561,7 +561,7 @@ typedef struct _MPT_ADAPTER
        u32                      sense_buf_low_dma;
        int                      mtrr_reg;
        struct pci_dev          *pcidev;        /* struct pci_dev pointer */
-       u8                      *memmap;        /* mmap address */
+       u8                      __iomem *memmap;        /* mmap address */
        struct Scsi_Host        *sh;            /* Scsi Host pointer */
        ScsiCfgData             spi_data;       /* Scsi config. data */
        MPT_IOCTL               *ioctl;         /* ioctl data pointer */