Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a5849726 authored by Ching Huang's avatar Ching Huang Committed by Christoph Hellwig
Browse files

arcmsr: remove calling arcmsr_hbb_enable_driver_mode 



Remove calling arcmsr_hbb_enable_driver_mode by in-lining the code into
the caller.

Signed-off-by: default avatarChing Huang <ching2048@areca.com.tw>
Reviewed-by: default avatarTomas Henzl <thenzl@redhat.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent 12aad947

drivers/scsi/arcmsr/arcmsr_hba.c

+6 −12
Original line number Diff line number Diff line
@@ -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: {