arcmsr: Replace calling arcmsr_hbb_enable_driver_mode
PATCH 8/16 arcmsr: Replace calling arcmsr_hbb_enable_driver_mode
From: Ching<[email protected]>
Replacing call arcmsr_hbb_enable_driver_mode by in-line code.
Signed-off-by Ching<[email protected]>
---
drivers/scsi/arcmsr/arcmsr_hba.c +6 -12
@@ -906,17 +906,6 @@ static uint8_t arcmsr_abort_allcmd(strucreturn 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;
@@ -2729,7 +2718,12 @@ static int arcmsr_iop_confirm(struct Ada 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 : {