Commit 4f6094f1 authored by Xiang Chen's avatar Xiang Chen Committed by Martin K. Petersen
Browse files

scsi: hisi_sas: Use managed PCI functions 

Use managed PCI functions such as pcim_enable_device() and
pcim_iomap_regions() to simplify exception handling code.

Link: https://lore.kernel.org/r/1629799260-120116-2-git-send-email-john.garry@huawei.com


Signed-off-by: default avatarXiang Chen <chenxiang66@hisilicon.com>
Signed-off-by: default avatarJohn Garry <john.garry@huawei.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 6880fa6c

drivers/scsi/hisi_sas/hisi_sas_v3_hw.c

+8 −12
Original line number Diff line number Diff line
@@ -518,6 +518,8 @@ struct hisi_sas_err_record_v3 { 
#define CHNL_INT_STS_INT2_MSK BIT(3)

#define CHNL_WIDTH 4



#define BAR_NO_V3_HW	5



enum {

	DSM_FUNC_ERR_HANDLE_MSI = 0,

};
@@ -4676,15 +4678,15 @@ hisi_sas_v3_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
	struct sas_ha_struct *sha;

	int rc, phy_nr, port_nr, i;



	rc = pci_enable_device(pdev);

	rc = pcim_enable_device(pdev);

	if (rc)

		goto err_out;



	pci_set_master(pdev);



	rc = pci_request_regions(pdev, DRV_NAME);

	rc = pcim_iomap_regions(pdev, 1 << BAR_NO_V3_HW, DRV_NAME);

	if (rc)

		goto err_out_disable_device;

		goto err_out;



	rc = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64));

	if (rc)
@@ -4692,20 +4694,20 @@ hisi_sas_v3_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
	if (rc) {

		dev_err(dev, "No usable DMA addressing method\n");

		rc = -ENODEV;

		goto err_out_regions;

		goto err_out;

	}



	shost = hisi_sas_shost_alloc_pci(pdev);

	if (!shost) {

		rc = -ENOMEM;

		goto err_out_regions;

		goto err_out;

	}



	sha = SHOST_TO_SAS_HA(shost);

	hisi_hba = shost_priv(shost);

	dev_set_drvdata(dev, sha);



	hisi_hba->regs = pcim_iomap(pdev, 5, 0);

	hisi_hba->regs = pcim_iomap_table(pdev)[BAR_NO_V3_HW];

	if (!hisi_hba->regs) {

		dev_err(dev, "cannot map register\n");

		rc = -ENOMEM;
@@ -4799,10 +4801,6 @@ hisi_sas_v3_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
err_out_ha:

	hisi_sas_free(hisi_hba);

	scsi_host_put(shost);

err_out_regions:

	pci_release_regions(pdev);

err_out_disable_device:

	pci_disable_device(pdev);

err_out:

	return rc;

}
@@ -4840,8 +4838,6 @@ static void hisi_sas_v3_remove(struct pci_dev *pdev) 
	sas_remove_host(sha->core.shost);



	hisi_sas_v3_destroy_irqs(pdev, hisi_hba);

	pci_release_regions(pdev);

	pci_disable_device(pdev);

	hisi_sas_free(hisi_hba);

	debugfs_exit_v3_hw(hisi_hba);

	scsi_host_put(shost);