arcmsr: remove calling arcmsr_hbb_enable_driver_mode
authorChing Huang <ching2048@areca.com.tw>
Tue, 19 Aug 2014 07:01:28 +0000 (15:01 +0800)
committerChristoph Hellwig <hch@lst.de>
Tue, 16 Sep 2014 16:39:44 +0000 (09:39 -0700)
Remove calling arcmsr_hbb_enable_driver_mode by in-lining the code into
the caller.

Signed-off-by: Ching Huang <ching2048@areca.com.tw>
Reviewed-by: Tomas Henzl <thenzl@redhat.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
drivers/scsi/arcmsr/arcmsr_hba.c

index bfe2ac460e01ca37e764e47840db0be99c65dc72..5dd520b3b6e25cbce36fca27a444052b73b82a74 100644 (file)
@@ -858,17 +858,6 @@ static uint8_t arcmsr_abort_allcmd(struct AdapterControlBlock *acb)
        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;
@@ -2665,7 +2654,12 @@ static int arcmsr_iop_confirm(struct AdapterControlBlock *acb)
                        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: {