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

Commit 25729a7f authored by Arjan van de Ven's avatar Arjan van de Ven Committed by James Bottomley
Browse files

[SCSI] advansys, arcmsr, ipr, nsp32, qla1280, stex: use pci_ioremap_bar() 



Use the newly introduced pci_ioremap_bar() function in drivers/scsi.
pci_ioremap_bar() just takes a pci device and a bar number, with the goal
of making it really hard to get wrong, while also having a central place
to stick sanity checks.

Signed-off-by: default avatarArjan van de Ven <arjan@linux.intel.com>
Acked-by: default avatarMatthew Wilcox <willy@linux.intel.com>
Cc: Brian King <brking@us.ibm.com>
Cc: Ed Lin <ed.lin@promise.com>
Cc: Nick Cheng <nick.cheng@areca.com.tw>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
parent decf67e3

drivers/scsi/advansys.c

+1 −2
Original line number Diff line number Diff line
@@ -13425,8 +13425,7 @@ static int __devinit advansys_board_found(struct Scsi_Host *shost, 
		}



		boardp->asc_n_io_port = pci_resource_len(pdev, 1);

		boardp->ioremap_addr = ioremap(pci_resource_start(pdev, 1),

					       boardp->asc_n_io_port);

		boardp->ioremap_addr = pci_ioremap_bar(pdev, 1);

		if (!boardp->ioremap_addr) {

			shost_printk(KERN_ERR, shost, "ioremap(%lx, %d) "

					"returned NULL\n",

drivers/scsi/arcmsr/arcmsr_hba.c

+3 −5
Original line number Diff line number Diff line
@@ -235,7 +235,7 @@ static int arcmsr_alloc_ccb_pool(struct AdapterControlBlock *acb) 
		uint32_t intmask_org;

		int i, j;



		acb->pmuA = ioremap(pci_resource_start(pdev, 0), pci_resource_len(pdev, 0));

		acb->pmuA = pci_ioremap_bar(pdev, 0);

		if (!acb->pmuA) {

			printk(KERN_NOTICE "arcmsr%d: memory mapping region fail \n",

							acb->host->host_no);
@@ -329,13 +329,11 @@ static int arcmsr_alloc_ccb_pool(struct AdapterControlBlock *acb) 
		reg = (struct MessageUnit_B *)(dma_coherent +

		ARCMSR_MAX_FREECCB_NUM * sizeof(struct CommandControlBlock));

		acb->pmuB = reg;

		mem_base0 = ioremap(pci_resource_start(pdev, 0),

					pci_resource_len(pdev, 0));

		mem_base0 = pci_ioremap_bar(pdev, 0);

		if (!mem_base0)

			goto out;



		mem_base1 = ioremap(pci_resource_start(pdev, 2),

					pci_resource_len(pdev, 2));

		mem_base1 = pci_ioremap_bar(pdev, 2);

		if (!mem_base1) {

			iounmap(mem_base0);

			goto out;

drivers/scsi/ipr.c

+1 −1
Original line number Diff line number Diff line
@@ -7473,7 +7473,7 @@ static int __devinit ipr_probe_ioa(struct pci_dev *pdev, 
		goto out_scsi_host_put;

	}



	ipr_regs = ioremap(ipr_regs_pci, pci_resource_len(pdev, 0));

	ipr_regs = pci_ioremap_bar(pdev, 0);



	if (!ipr_regs) {

		dev_err(&pdev->dev,

drivers/scsi/nsp32.c

+1 −2
Original line number Diff line number Diff line
@@ -3401,8 +3401,7 @@ static int __devinit nsp32_probe(struct pci_dev *pdev, const struct pci_device_i 
	data->IrqNumber   = pdev->irq;

	data->BaseAddress = pci_resource_start(pdev, 0);

	data->NumAddress  = pci_resource_len  (pdev, 0);

	data->MmioAddress = ioremap_nocache(pci_resource_start(pdev, 1),

					       pci_resource_len  (pdev, 1));

	data->MmioAddress = pci_ioremap_bar(pdev, 1);

	data->MmioLength  = pci_resource_len  (pdev, 1);



	pci_set_master(pdev);

drivers/scsi/qla1280.c

+1 −2
Original line number Diff line number Diff line
@@ -4294,8 +4294,7 @@ qla1280_probe_one(struct pci_dev *pdev, const struct pci_device_id *id) 
	error = -ENODEV;



#if MEMORY_MAPPED_IO

	ha->mmpbase = ioremap(pci_resource_start(ha->pdev, 1),

			      pci_resource_len(ha->pdev, 1));

	ha->mmpbase = pci_ioremap_bar(ha->pdev, 1);

	if (!ha->mmpbase) {

		printk(KERN_INFO "qla1280: Unable to map I/O memory\n");

		goto error_free_response_ring;