Merge branch 'master' into for_paulus

[linux-drm-fsl-dcu.git] / drivers / scsi / aacraid / comminit.c

diff --git a/drivers/scsi/aacraid/comminit.c b/drivers/scsi/aacraid/comminit.c
index 1cd3584ba7ff6ee39cf3c4e40bb8b0ce5c3741e0..df67ba686023d891a234c3ed9e577a632847e1db 100644 (file)
--- a/drivers/scsi/aacraid/comminit.c
+++ b/drivers/scsi/aacraid/comminit.c
@@ -95,7 +95,7 @@ static int aac_alloc_comm(struct aac_dev *dev, void **commaddr, unsigned long co
        init->HostPhysMemPages = cpu_to_le32(AAC_MAX_HOSTPHYSMEMPAGES);
 
        init->InitFlags = 0;
-       if (dev->new_comm_interface) {
+       if (dev->comm_interface == AAC_COMM_MESSAGE) {
                init->InitFlags = cpu_to_le32(INITFLAGS_NEW_COMM_SUPPORTED);
                dprintk((KERN_WARNING"aacraid: New Comm Interface enabled\n"));
        }
@@ -180,7 +180,7 @@ int aac_send_shutdown(struct aac_dev * dev)
                          -2 /* Timeout silently */, 1,
                          NULL, NULL);
 
-       if (status == 0)
+       if (status >= 0)
                aac_fib_complete(fibctx);
        aac_fib_free(fibctx);
        return status;
@@ -297,27 +297,24 @@ struct aac_dev *aac_init_adapter(struct aac_dev *dev)
                - sizeof(struct aac_fibhdr)
                - sizeof(struct aac_write) + sizeof(struct sgentry))
                        / sizeof(struct sgentry);
-       dev->new_comm_interface = 0;
+       dev->comm_interface = AAC_COMM_PRODUCER;
        dev->raw_io_64 = 0;
        if ((!aac_adapter_sync_cmd(dev, GET_ADAPTER_PROPERTIES,
                0, 0, 0, 0, 0, 0, status+0, status+1, status+2, NULL, NULL)) &&
                        (status[0] == 0x00000001)) {
                if (status[1] & AAC_OPT_NEW_COMM_64)
                        dev->raw_io_64 = 1;
-               if (status[1] & AAC_OPT_NEW_COMM)
-                       dev->new_comm_interface = dev->a_ops.adapter_send != 0;
-               if (dev->new_comm_interface && (status[2] > dev->base_size)) {
-                       iounmap(dev->regs.sa);
+               if (dev->a_ops.adapter_comm &&
+                   (status[1] & AAC_OPT_NEW_COMM))
+                       dev->comm_interface = AAC_COMM_MESSAGE;
+               if ((dev->comm_interface == AAC_COMM_MESSAGE) &&
+                   (status[2] > dev->base_size)) {
+                       aac_adapter_ioremap(dev, 0);
                        dev->base_size = status[2];
-                       dprintk((KERN_DEBUG "ioremap(%lx,%d)\n",
-                         host->base, status[2]));
-                       dev->regs.sa = ioremap(host->base, status[2]);
-                       if (dev->regs.sa == NULL) {
+                       if (aac_adapter_ioremap(dev, status[2])) {
                                /* remap failed, go back ... */
-                               dev->new_comm_interface = 0;
-                               dev->regs.sa = ioremap(host->base, 
-                                               AAC_MIN_FOOTPRINT_SIZE);
-                               if (dev->regs.sa == NULL) {     
+                               dev->comm_interface = AAC_COMM_PRODUCER;
+                               if (aac_adapter_ioremap(dev, AAC_MIN_FOOTPRINT_SIZE)) {
                                        printk(KERN_WARNING
                                          "aacraid: unable to map adapter.\n");
                                        return NULL;
@@ -391,7 +388,7 @@ struct aac_dev *aac_init_adapter(struct aac_dev *dev)
         *      Ok now init the communication subsystem
         */
 
-       dev->queues = (struct aac_queue_block *) kmalloc(sizeof(struct aac_queue_block), GFP_KERNEL);
+       dev->queues = kmalloc(sizeof(struct aac_queue_block), GFP_KERNEL);
        if (dev->queues == NULL) {
                printk(KERN_ERR "Error could not allocate comm region.\n");
                return NULL;