scsi: hisi_sas: Remove some unnecessary code (a07b4876) · Commits · 戴 / test

drivers/scsi/hisi_sas/hisi_sas_main.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -2358,7 +2358,7 @@ int hisi_sas_alloc(struct hisi_hba *hisi_hba)

		s = HISI_SAS_MAX_ITCT_ENTRIES * sizeof(struct hisi_sas_itct);
		hisi_hba->itct = dmam_alloc_coherent(dev, s, &hisi_hba->itct_dma,
		GFP_KERNEL \| __GFP_ZERO);
		GFP_KERNEL);
		if (!hisi_hba->itct)
		goto err_out;

		@@ -2385,7 +2385,7 @@ int hisi_sas_alloc(struct hisi_hba *hisi_hba)
		void *buf;

		buf = dmam_alloc_coherent(dev, s, &buf_dma,
		GFP_KERNEL \| __GFP_ZERO);
		GFP_KERNEL);
		if (!buf)
		goto err_out;

		@@ -2434,7 +2434,6 @@ int hisi_sas_alloc(struct hisi_hba *hisi_hba)
		GFP_KERNEL);
		if (!hisi_hba->sata_breakpoint)
		goto err_out;
		hisi_sas_init_mem(hisi_hba);

		hisi_sas_slot_index_init(hisi_hba);
		hisi_hba->last_slot_index = HISI_SAS_UNRESERVED_IPTT;

+1 −4

Original line number	Diff line number	Diff line
		@@ -1914,7 +1914,7 @@ static void fatal_ecc_int_v3_hw(struct hisi_hba *hisi_hba)
		u32 irq_value, irq_msk;

		irq_msk = hisi_sas_read32(hisi_hba, SAS_ECC_INTR_MSK);
		hisi_sas_write32(hisi_hba, SAS_ECC_INTR_MSK, irq_msk \| 0xffffffff);
		hisi_sas_write32(hisi_hba, SAS_ECC_INTR_MSK, 0xffffffff);

		irq_value = hisi_sas_read32(hisi_hba, SAS_ECC_INTR);
		if (irq_value)
		@@ -3008,8 +3008,6 @@ hisi_sas_shost_alloc_pci(struct pci_dev *pdev)
		else
		hisi_hba->prot_mask = prot_mask;

		timer_setup(&hisi_hba->timer, NULL, 0);

		if (hisi_sas_get_fw_info(hisi_hba) < 0)
		goto err_out;

		@@ -3099,7 +3097,6 @@ hisi_sas_v3_probe(struct pci_dev pdev, const struct pci_device_id id)
		sha->lldd_module = THIS_MODULE;
		sha->sas_addr = &hisi_hba->sas_addr[0];
		sha->num_phys = hisi_hba->n_phy;
		sha->core.shost = hisi_hba->shost;

		for (i = 0; i < hisi_hba->n_phy; i++) {
		sha->sas_phy[i] = &hisi_hba->phy[i].sas_phy;