53 lines
1.8 KiB
Diff
53 lines
1.8 KiB
Diff
From: Ching Huang <ching2048@areca.com.tw>
|
|
Date: Tue, 19 Aug 2014 15:01:28 +0800
|
|
Subject: [08/19] arcmsr: remove calling arcmsr_hbb_enable_driver_mode
|
|
Origin: https://git.kernel.org/linus/a5849726bc88506e84e5754d6bfde81ba091f24d
|
|
Bug-Debian: https://bugs.debian.org/698821
|
|
|
|
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 | 18 ++++++------------
|
|
1 file changed, 6 insertions(+), 12 deletions(-)
|
|
|
|
diff --git a/drivers/scsi/arcmsr/arcmsr_hba.c b/drivers/scsi/arcmsr/arcmsr_hba.c
|
|
index bfe2ac4..5dd520b 100644
|
|
--- a/drivers/scsi/arcmsr/arcmsr_hba.c
|
|
+++ b/drivers/scsi/arcmsr/arcmsr_hba.c
|
|
@@ -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: {
|