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

scsi: hisi_sas: Remove unnecessary variable to hold DMA map elements 

Use slot->n_elem to store the return value of dma_map_sg() for SSP and SMP
IOs, and remove unnecessary variable n_elem_req.

Link: https://lore.kernel.org/r/1657823002-139010-3-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 eed9f513

drivers/scsi/hisi_sas/hisi_sas_main.c

+18 −25
Original line number Diff line number Diff line
@@ -220,6 +220,7 @@ void hisi_sas_slot_task_free(struct hisi_hba *hisi_hba, struct sas_task *task, 


		if (!sas_protocol_ata(task->task_proto)) {

			if (slot->n_elem)

				if (task->task_proto & SAS_PROTOCOL_SSP)

					dma_unmap_sg(dev, task->scatter,

						     task->num_scatter,

						     task->data_dir);
@@ -269,19 +270,15 @@ static void hisi_sas_task_prep_abort(struct hisi_hba *hisi_hba, 
}



static void hisi_sas_dma_unmap(struct hisi_hba *hisi_hba,

			       struct sas_task *task, int n_elem,

			       int n_elem_req)

			       struct sas_task *task, int n_elem)

{

	struct device *dev = hisi_hba->dev;



	if (!sas_protocol_ata(task->task_proto)) {

	if (!sas_protocol_ata(task->task_proto) && n_elem) {

		if (task->num_scatter) {

			if (n_elem)

				dma_unmap_sg(dev, task->scatter,

					     task->num_scatter,

			dma_unmap_sg(dev, task->scatter, task->num_scatter,

				     task->data_dir);

		} else if (task->task_proto & SAS_PROTOCOL_SMP) {

			if (n_elem_req)

			dma_unmap_sg(dev, &task->smp_task.smp_req,

				     1, DMA_TO_DEVICE);

		}
@@ -289,8 +286,7 @@ static void hisi_sas_dma_unmap(struct hisi_hba *hisi_hba, 
}



static int hisi_sas_dma_map(struct hisi_hba *hisi_hba,

			    struct sas_task *task, int *n_elem,

			    int *n_elem_req)

			    struct sas_task *task, int *n_elem)

{

	struct device *dev = hisi_hba->dev;

	int rc;
@@ -308,9 +304,9 @@ static int hisi_sas_dma_map(struct hisi_hba *hisi_hba, 
				goto prep_out;

			}

		} else if (task->task_proto & SAS_PROTOCOL_SMP) {

			*n_elem_req = dma_map_sg(dev, &task->smp_task.smp_req,

			*n_elem = dma_map_sg(dev, &task->smp_task.smp_req,

					     1, DMA_TO_DEVICE);

			if (!*n_elem_req) {

			if (!*n_elem) {

				rc = -ENOMEM;

				goto prep_out;

			}
@@ -332,8 +328,7 @@ static int hisi_sas_dma_map(struct hisi_hba *hisi_hba, 


err_out_dma_unmap:

	/* It would be better to call dma_unmap_sg() here, but it's messy */

	hisi_sas_dma_unmap(hisi_hba, task, *n_elem,

			   *n_elem_req);

	hisi_sas_dma_unmap(hisi_hba, task, *n_elem);

prep_out:

	return rc;

}
@@ -457,7 +452,7 @@ void hisi_sas_task_deliver(struct hisi_hba *hisi_hba, 


static int hisi_sas_queue_command(struct sas_task *task, gfp_t gfp_flags)

{

	int n_elem = 0, n_elem_dif = 0, n_elem_req = 0;

	int n_elem = 0, n_elem_dif = 0;

	struct domain_device *device = task->dev;

	struct asd_sas_port *sas_port = device->port;

	struct hisi_sas_device *sas_dev = device->lldd_dev;
@@ -568,8 +563,7 @@ static int hisi_sas_queue_command(struct sas_task *task, gfp_t gfp_flags) 
		return -EINVAL;

	}



	rc = hisi_sas_dma_map(hisi_hba, task, &n_elem,

			      &n_elem_req);

	rc = hisi_sas_dma_map(hisi_hba, task, &n_elem);

	if (rc < 0)

		goto prep_out;
@@ -605,8 +599,7 @@ static int hisi_sas_queue_command(struct sas_task *task, gfp_t gfp_flags) 
	if (!sas_protocol_ata(task->task_proto))

		hisi_sas_dif_dma_unmap(hisi_hba, task, n_elem_dif);

err_out_dma_unmap:

	hisi_sas_dma_unmap(hisi_hba, task, n_elem,

				   n_elem_req);

	hisi_sas_dma_unmap(hisi_hba, task, n_elem);

prep_out:

	dev_err(dev, "task exec: failed[%d]!\n", rc);

	return rc;