[PATCH] aacraid 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/aacraid/aacraid.h b/drivers/scsi/aacraid/aacraid.h
index b68e16f8a15a213649bc6bd8e10409ac1e93c4a6..bd1419e0e30f1fd09b60f17674d57c3318fa9897 100644 (file)
--- a/drivers/scsi/aacraid/aacraid.h
+++ b/drivers/scsi/aacraid/aacraid.h
@@ -863,9 +863,9 @@ struct aac_dev
         */
        union
        {
-               struct sa_registers *sa;
-               struct rx_registers *rx;
-               struct rkt_registers *rkt;
+               struct sa_registers __iomem *sa;
+               struct rx_registers __iomem *rx;
+               struct rkt_registers __iomem *rkt;
        } regs;
        u32                     OIMR; /* Mask Register Cache */
        /*

diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c
index 2537d2b521d5ba2fe70d4501c4cf323c2972373e..3ed8b2c68fc9b033348fbe474ce16597398594ca 100644 (file)
--- a/drivers/scsi/aacraid/linit.c
+++ b/drivers/scsi/aacraid/linit.c
@@ -630,7 +630,7 @@ out_deinit:
        pci_free_consistent(aac->pdev, aac->comm_size, aac->comm_addr, aac->comm_phys);
        kfree(aac->queues);
        free_irq(pdev->irq, aac);
-       iounmap((void * )aac->regs.sa);
+       iounmap(aac->regs.sa);
  out_free_fibs:
        kfree(aac->fibs);
        kfree(aac->fsa_dev);
@@ -659,7 +659,7 @@ static void __devexit aac_remove_one(struct pci_dev *pdev)
        kfree(aac->queues);
 
        free_irq(pdev->irq, aac);
-       iounmap((void * )aac->regs.sa);
+       iounmap(aac->regs.sa);
        
        kfree(aac->fibs);
        

diff --git a/drivers/scsi/aacraid/rkt.c b/drivers/scsi/aacraid/rkt.c
index 7a7b3d7bc709c8fd3155daaa5352f7f0b838e6e1..3846422228e3f02391a3dc5992d9e722746fed7e 100644 (file)
--- a/drivers/scsi/aacraid/rkt.c
+++ b/drivers/scsi/aacraid/rkt.c
@@ -405,7 +405,7 @@ int aac_rkt_init(struct aac_dev *dev)
        /*
         *      Map in the registers from the adapter.
         */
-       if((dev->regs.rkt = (struct rkt_registers *)ioremap((unsigned long)dev->scsi_host_ptr->base, 8192))==NULL)
+       if((dev->regs.rkt = ioremap((unsigned long)dev->scsi_host_ptr->base, 8192))==NULL)
        {       
                printk(KERN_WARNING "aacraid: unable to map i960.\n" );
                goto error_iounmap;

diff --git a/drivers/scsi/aacraid/rx.c b/drivers/scsi/aacraid/rx.c
index e111087c06b6ae8f79c56762c98d6de799b6bf69..18ba39aee543b182ca0f3fd4606bf5b4dd6615a9 100644 (file)
--- a/drivers/scsi/aacraid/rx.c
+++ b/drivers/scsi/aacraid/rx.c
@@ -403,7 +403,7 @@ int aac_rx_init(struct aac_dev *dev)
        /*
         *      Map in the registers from the adapter.
         */
-       if((dev->regs.rx = (struct rx_registers *)ioremap((unsigned long)dev->scsi_host_ptr->base, 8192))==NULL)
+       if((dev->regs.rx = ioremap((unsigned long)dev->scsi_host_ptr->base, 8192))==NULL)
        {       
                printk(KERN_WARNING "aacraid: unable to map i960.\n" );
                return -1;

diff --git a/drivers/scsi/aacraid/sa.c b/drivers/scsi/aacraid/sa.c
index 23e3b7644472c0d9f932deebb6f734a6b062043f..9e56770650a310c0c86b3f0777344cc95ae41526 100644 (file)
--- a/drivers/scsi/aacraid/sa.c
+++ b/drivers/scsi/aacraid/sa.c
@@ -357,7 +357,7 @@ int aac_sa_init(struct aac_dev *dev)
         */
        dprintk(("PREMAP\n"));
 
-       if((dev->regs.sa = (struct sa_registers *)ioremap((unsigned long)dev->scsi_host_ptr->base, 8192))==NULL)
+       if((dev->regs.sa = ioremap((unsigned long)dev->scsi_host_ptr->base, 8192))==NULL)
        {       
                printk(KERN_WARNING "aacraid: unable to map ARM.\n" );
                goto error_iounmap;