aacraid iomem annotations
Subsystems (2)
PATCH 1/1 aacraid iomem annotations
drivers/scsi/aacraid/aacraid.h +3 -3
@@ -863,9 +863,9 @@*/ 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 */ /*
===== drivers/scsi/aacraid/linit.c 1.41 vs edited =====
drivers/scsi/aacraid/linit.c +2 -2
@@ -630,7 +630,7 @@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 @@kfree (aac->queues);free_irq (pdev->irq, aac); -iounmap ((void * )aac->regs.sa); +iounmap (aac->regs.sa);kfree (aac->fibs);
===== drivers/scsi/aacraid/rkt.c 1.5 vs edited =====
drivers/scsi/aacraid/rkt.c +2 -2
@@ -405,8 +405,8 @@/* * Map in the registers from the adapter. */ -if ((dev->regs.rkt = (struct rkt_registers *)ioremap ((unsigned long )dev->scsi_host_ptr->base,8192 ))==NULL ) - { + dev->regs.rkt =ioremap ((unsigned long )dev->scsi_host_ptr->base,8192 ); +if (!dev->regs.rkt) {printk (KERN_WARNING "aacraid: unable to map i960.\n" ); goto error_iounmap; }
===== drivers/scsi/aacraid/rx.c 1.10 vs edited =====
drivers/scsi/aacraid/rx.c +2 -2
@@ -403,8 +403,8 @@/* * Map in the registers from the adapter. */ -if ((dev->regs.rx = (struct rx_registers *)ioremap ((unsigned long )dev->scsi_host_ptr->base,8192 ))==NULL ) - { + dev->regs.rx =ioremap ((unsigned long )dev->scsi_host_ptr->base,8192 ); +if (!dev->regs.rx) {printk (KERN_WARNING "aacraid: unable to map i960.\n" );return -1 ; }
===== drivers/scsi/aacraid/sa.c 1.11 vs edited =====
drivers/scsi/aacraid/sa.c +2 -2
@@ -357,8 +357,8 @@*/ dprintk (("PREMAP\n" )); -if ((dev->regs.sa = (struct sa_registers *)ioremap ((unsigned long )dev->scsi_host_ptr->base,8192 ))==NULL ) - { + dev->regs.sa =ioremap ((unsigned long )dev->scsi_host_ptr->base,8192 ); +if (!dev->regs.sa) {printk (KERN_WARNING "aacraid: unable to map ARM.\n" ); goto error_iounmap; }