vserver 1.9.5.x5

[linux-2.6.git] / drivers / scsi / aacraid / sa.c

diff --git a/drivers/scsi/aacraid/sa.c b/drivers/scsi/aacraid/sa.c
index 494d1fd..13e8818 100644 (file)
--- a/drivers/scsi/aacraid/sa.c
+++ b/drivers/scsi/aacraid/sa.c
@@ -38,6 +38,7 @@
 #include <linux/blkdev.h>
 #include <linux/delay.h>
 #include <linux/completion.h>
+#include <linux/time.h>
 #include <linux/interrupt.h>
 #include <asm/semaphore.h>
 
@@ -80,68 +81,6 @@ static irqreturn_t aac_sa_intr(int irq, void *dev_id, struct pt_regs *regs)
        return IRQ_NONE;
 }
 
-/**
- *     aac_sa_enable_interrupt -       enable an interrupt event
- *     @dev: Which adapter to enable.
- *     @event: Which adapter event.
- *
- *     This routine will enable the corresponding adapter event to cause an interrupt on 
- *     the host.
- */
- 
-void aac_sa_enable_interrupt(struct aac_dev *dev, u32 event)
-{
-       switch (event) {
-
-       case HostNormCmdQue:
-               sa_writew(dev, SaDbCSR.PRICLEARIRQMASK, DOORBELL_1);
-               break;
-
-       case HostNormRespQue:
-               sa_writew(dev, SaDbCSR.PRICLEARIRQMASK, DOORBELL_2);
-               break;
-
-       case AdapNormCmdNotFull:
-               sa_writew(dev, SaDbCSR.PRICLEARIRQMASK, DOORBELL_3);
-               break;
-
-       case AdapNormRespNotFull:
-               sa_writew(dev, SaDbCSR.PRICLEARIRQMASK, DOORBELL_4);
-               break;
-       }
-}
-
-/**
- *     aac_sa_disable_interrupt        -       disable an interrupt event
- *     @dev: Which adapter to enable.
- *     @event: Which adapter event.
- *
- *     This routine will enable the corresponding adapter event to cause an interrupt on 
- *     the host.
- */
-
-void aac_sa_disable_interrupt (struct aac_dev *dev, u32 event)
-{
-       switch (event) {
-
-       case HostNormCmdQue:
-               sa_writew(dev, SaDbCSR.PRISETIRQMASK, DOORBELL_1);
-               break;
-
-       case HostNormRespQue:
-               sa_writew(dev, SaDbCSR.PRISETIRQMASK, DOORBELL_2);
-               break;
-
-       case AdapNormCmdNotFull:
-               sa_writew(dev, SaDbCSR.PRISETIRQMASK, DOORBELL_3);
-               break;
-
-       case AdapNormRespNotFull:
-               sa_writew(dev, SaDbCSR.PRISETIRQMASK, DOORBELL_4);
-               break;
-       }
-}
-
 /**
  *     aac_sa_notify_adapter           -       handle adapter notification
  *     @dev:   Adapter that notification is for
@@ -329,27 +268,24 @@ static int aac_sa_check_health(struct aac_dev *dev)
         *      Everything is OK
         */
        return 0;
-} /* aac_sa_check_health */
+}
 
 /**
  *     aac_sa_init     -       initialize an ARM based AAC card
  *     @dev: device to configure
- *     @devnum: adapter number
  *
  *     Allocate and set up resources for the ARM based AAC variants. The 
  *     device_interface in the commregion will be allocated and linked 
  *     to the comm region.
  */
 
-int aac_sa_init(struct aac_dev *dev, unsigned long devnum)
+int aac_sa_init(struct aac_dev *dev)
 {
        unsigned long start;
        unsigned long status;
        int instance;
        const char *name;
 
-       dev->devnum = devnum;
-
        dprintk(("PREINST\n"));
        instance = dev->id;
        name     = dev->name;
@@ -359,24 +295,24 @@ int aac_sa_init(struct aac_dev *dev, unsigned long devnum)
         */
        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" );
-               return -1;
+               goto error_iounmap;
        }
        /*
         *      Check to see if the board failed any self tests.
         */
        if (sa_readl(dev, Mailbox7) & SELF_TEST_FAILED) {
                printk(KERN_WARNING "%s%d: adapter self-test failed.\n", name, instance);
-               return -1;
+               goto error_iounmap;
        }
        /*
         *      Check to see if the board panic'd while booting.
         */
        if (sa_readl(dev, Mailbox7) & KERNEL_PANIC) {
                printk(KERN_WARNING "%s%d: adapter kernel panic'd.\n", name, instance);
-               return -1;
+               goto error_iounmap;
        }
        start = jiffies;
        /*
@@ -386,7 +322,7 @@ int aac_sa_init(struct aac_dev *dev, unsigned long devnum)
                if (time_after(jiffies, start+180*HZ)) {
                        status = sa_readl(dev, Mailbox7) >> 16;
                        printk(KERN_WARNING "%s%d: adapter kernel failed to start, init status = %d.\n", name, instance, le32_to_cpu(status));
-                       return -1;
+                       goto error_iounmap;
                }
                set_current_state(TASK_UNINTERRUPTIBLE);
                schedule_timeout(1);
@@ -395,7 +331,7 @@ int aac_sa_init(struct aac_dev *dev, unsigned long devnum)
        dprintk(("ATIRQ\n"));
        if (request_irq(dev->scsi_host_ptr->irq, aac_sa_intr, SA_SHIRQ|SA_INTERRUPT, "aacraid", (void *)dev ) < 0) {
                printk(KERN_WARNING "%s%d: Interrupt unavailable.\n", name, instance);
-               return -1;
+               goto error_iounmap;
        }
 
        /*
@@ -403,8 +339,6 @@ int aac_sa_init(struct aac_dev *dev, unsigned long devnum)
         */
 
        dev->a_ops.adapter_interrupt = aac_sa_interrupt_adapter;
-       dev->a_ops.adapter_enable_int = aac_sa_enable_interrupt;
-       dev->a_ops.adapter_disable_int = aac_sa_disable_interrupt;
        dev->a_ops.adapter_notify = aac_sa_notify_adapter;
        dev->a_ops.adapter_sync_cmd = sa_sync_cmd;
        dev->a_ops.adapter_check_health = aac_sa_check_health;
@@ -412,7 +346,7 @@ int aac_sa_init(struct aac_dev *dev, unsigned long devnum)
        dprintk(("FUNCDONE\n"));
 
        if(aac_init_adapter(dev) == NULL)
-               return -1;
+               goto error_irq;
 
        dprintk(("NEWADAPTDONE\n"));
        /*
@@ -421,7 +355,7 @@ int aac_sa_init(struct aac_dev *dev, unsigned long devnum)
        dev->thread_pid = kernel_thread((int (*)(void *))aac_command_thread, dev, 0);
        if (dev->thread_pid < 0) {
                printk(KERN_ERR "aacraid: Unable to create command thread.\n");
-               return -1;
+               goto error_kfree;
        }
 
        /*
@@ -432,5 +366,17 @@ int aac_sa_init(struct aac_dev *dev, unsigned long devnum)
        aac_sa_start_adapter(dev);
        dprintk(("STARTED\n"));
        return 0;
+
+
+error_kfree:
+       kfree(dev->queues);
+
+error_irq:
+       free_irq(dev->scsi_host_ptr->irq, (void *)dev);
+
+error_iounmap:
+       iounmap(dev->regs.sa);
+
+       return -1;
 }