[PATCH] nsp32 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/scsi/nsp32.c b/drivers/scsi/nsp32.c
index 1f9f58c153d23fc694fc01f8cfb4106e9dcbccc7..0f8ea29642d0b66b0759ad6a9811ad3799fc6a6a 100644 (file)
--- a/drivers/scsi/nsp32.c
+++ b/drivers/scsi/nsp32.c
@@ -2721,7 +2721,7 @@ static int nsp32_detect(Scsi_Host_Template *sht)
        host->io_port   = data->BaseAddress;
        host->unique_id = data->BaseAddress;
        host->n_io_port = data->NumAddress;
-       host->base      = data->MmioAddress;
+       host->base      = (unsigned long)data->MmioAddress;
 #if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,63))
        scsi_set_device(host, &PCIDEV->dev);
 #else
@@ -2939,8 +2939,8 @@ static int nsp32_release(struct Scsi_Host *host)
                release_region(host->io_port, host->n_io_port);
        }
 
-       if (data->MmioAddress != 0) {
-               iounmap((void *)(data->MmioAddress));
+       if (data->MmioAddress) {
+               iounmap(data->MmioAddress);
        }
 
        return 0;
@@ -3512,8 +3512,7 @@ static int __devinit nsp32_probe(struct pci_dev *pdev, const struct pci_device_i
        data->IrqNumber   = pdev->irq;
        data->BaseAddress = pci_resource_start(pdev, 0);
        data->NumAddress  = pci_resource_len  (pdev, 0);
-       data->MmioAddress = 
-               (unsigned long)ioremap_nocache(pci_resource_start(pdev, 1),
+       data->MmioAddress = ioremap_nocache(pci_resource_start(pdev, 1),
                                               pci_resource_len  (pdev, 1));
        data->MmioLength  = pci_resource_len  (pdev, 1);
 
@@ -3525,7 +3524,7 @@ static int __devinit nsp32_probe(struct pci_dev *pdev, const struct pci_device_i
        ret = scsi_register_host(&nsp32_template);
 #endif
 
-       nsp32_msg(KERN_INFO, "irq: %i mmio: 0x%lx+0x%lx slot: %s model: %s",
+       nsp32_msg(KERN_INFO, "irq: %i mmio: %p+0x%lx slot: %s model: %s",
                  pdev->irq,
                  data->MmioAddress, data->MmioLength,
                  pci_name(pdev),

diff --git a/drivers/scsi/nsp32.h b/drivers/scsi/nsp32.h
index 6d273c50866f443853de6d2b6f00b32656c2c0ed..5664398fa0ad2aa66dd083a9fdbea47aeb4938dc 100644 (file)
--- a/drivers/scsi/nsp32.h
+++ b/drivers/scsi/nsp32.h
@@ -563,7 +563,7 @@ typedef struct _nsp32_hw_data {
        int           IrqNumber;
        int           BaseAddress;
        int           NumAddress;
-       unsigned long MmioAddress;
+       void __iomem *MmioAddress;
 #define NSP32_MMIO_OFFSET 0x0800
        unsigned long MmioLength;