return rtnval;
 }
 
-static bool arcmsr_hbb_enable_driver_mode(struct AdapterControlBlock *pacb)
-{
-       struct MessageUnit_B *reg = pacb->pmuB;
-       writel(ARCMSR_MESSAGE_START_DRIVER_MODE, reg->drv2iop_doorbell);
-       if (!arcmsr_hbb_wait_msgint_ready(pacb)) {
-               printk(KERN_ERR "arcmsr%d: can't set driver mode. \n", pacb->host->host_no);
-               return false;
-       }
-       return true;
-}
-
 static void arcmsr_pci_unmap_dma(struct CommandControlBlock *ccb)
 {
        struct scsi_cmnd *pcmd = ccb->pcmd;
                        timeout \n",acb->host->host_no);
                        return 1;
                }
-               arcmsr_hbb_enable_driver_mode(acb);
+               writel(ARCMSR_MESSAGE_START_DRIVER_MODE, reg->drv2iop_doorbell);
+               if (!arcmsr_hbb_wait_msgint_ready(acb)) {
+                       pr_err("arcmsr%d: can't set driver mode.\n",
+                               acb->host->host_no);
+                       return 1;
+               }
                }
                break;
        case ACB_ADAPTER_TYPE_C: {