[PATCH 1/3] scsi: qla1280: Fix a function name in comments

[PATCH 1/3] scsi: qla1280: Fix a function name in comments

[Cai Huoqing]

Use dma_map_single() instead of pci_map_single(),
because only dma_map_single() is called here.

Signed-off-by: Cai Huoqing <caihuoqing@baidu.com>
---
 drivers/scsi/qla1280.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/scsi/qla1280.c b/drivers/scsi/qla1280.c
index d0b4e063bfe1..20b1709e8288 100644
--- a/drivers/scsi/qla1280.c
+++ b/drivers/scsi/qla1280.c
@@ -19,7 +19,7 @@
     Rev  3.26, January 16, 2006 Jes Sorensen
 	- Ditch all < 2.6 support
     Rev  3.25.1, February 10, 2005 Christoph Hellwig
-	- use pci_map_single to map non-S/G requests
+	- use dma_map_single to map non-S/G requests
 	- remove qla1280_proc_info
     Rev  3.25, September 28, 2004, Christoph Hellwig
 	- add support for ISP1020/1040
-- 
2.25.1

[PATCH 2/3] scsi: 3w-xxxx: Fix a function name in comments

[Cai Huoqing]

Use dma_map_single() instead of pci_map_single(),
because only dma_map_single() is called here.

Signed-off-by: Cai Huoqing <caihuoqing@baidu.com>
---
 drivers/scsi/3w-xxxx.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/scsi/3w-xxxx.c b/drivers/scsi/3w-xxxx.c
index 4ee485ab2714..afe35220ed29 100644
--- a/drivers/scsi/3w-xxxx.c
+++ b/drivers/scsi/3w-xxxx.c
@@ -156,7 +156,7 @@
                  same card number.
                  Fix bug where cards were being shut down more than once.
    1.02.00.029 - Add missing pci_free_consistent() in tw_allocate_memory().
-                 Replace pci_map_single() with pci_map_page() for highmem.
+                 Replace dma_map_single() with dma_map_page() for highmem.
                  Check for tw_setfeature() failure.
    1.02.00.030 - Make driver 64-bit clean.
    1.02.00.031 - Cleanup polling timeouts/routines in several places.
-- 
2.25.1

[PATCH 3/3] scsi: lpfc: Fix a function name in comments

[Cai Huoqing]

Use dma_map_sg() instead of pci_map_sg(),
because only dma_map_sg() is called here.

Signed-off-by: Cai Huoqing <caihuoqing@baidu.com>
---
 drivers/scsi/lpfc/lpfc_scsi.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c
index 27ea8f552ede..83ad03d22a49 100644
--- a/drivers/scsi/lpfc/lpfc_scsi.c
+++ b/drivers/scsi/lpfc/lpfc_scsi.c
@@ -894,7 +894,7 @@ lpfc_scsi_prep_dma_buf_s3(struct lpfc_hba *phba, struct lpfc_io_buf *lpfc_cmd)
 	bpl += 2;
 	if (scsi_sg_count(scsi_cmnd)) {
 		/*
-		 * The driver stores the segment count returned from pci_map_sg
+		 * The driver stores the segment count returned from dma_map_sg
 		 * because this a count of dma-mappings used to map the use_sg
 		 * pages.  They are not guaranteed to be the same for those
 		 * architectures that implement an IOMMU.
@@ -2589,7 +2589,7 @@ lpfc_bg_scsi_prep_dma_buf_s3(struct lpfc_hba *phba,
 	bpl += 2;
 	if (scsi_sg_count(scsi_cmnd)) {
 		/*
-		 * The driver stores the segment count returned from pci_map_sg
+		 * The driver stores the segment count returned from dma_map_sg
 		 * because this a count of dma-mappings used to map the use_sg
 		 * pages.  They are not guaranteed to be the same for those
 		 * architectures that implement an IOMMU.
@@ -3249,7 +3249,7 @@ lpfc_scsi_prep_dma_buf_s4(struct lpfc_hba *phba, struct lpfc_io_buf *lpfc_cmd)
 	 */
 	if (scsi_sg_count(scsi_cmnd)) {
 		/*
-		 * The driver stores the segment count returned from pci_map_sg
+		 * The driver stores the segment count returned from dma_map_sg
 		 * because this a count of dma-mappings used to map the use_sg
 		 * pages.  They are not guaranteed to be the same for those
 		 * architectures that implement an IOMMU.
@@ -3488,7 +3488,7 @@ lpfc_bg_scsi_prep_dma_buf_s4(struct lpfc_hba *phba,
 	 */
 	if (scsi_sg_count(scsi_cmnd)) {
 		/*
-		 * The driver stores the segment count returned from pci_map_sg
+		 * The driver stores the segment count returned from dma_map_sg
 		 * because this a count of dma-mappings used to map the use_sg
 		 * pages.  They are not guaranteed to be the same for those
 		 * architectures that implement an IOMMU.
-- 
2.25.1

Re: [PATCH 1/3] scsi: qla1280: Fix a function name in comments

[Martin K. Petersen]

Cai,

> Use dma_map_single() instead of pci_map_single(),
> because only dma_map_single() is called here.

pci_map_single() was the appropriate interface when the change log entry
was written. And the original entry accurately describes the change that
was made to the code back then. Whereas your proposed fix does not.

There is little benefit to having change logs in drivers in a modern
context. However, these entries predate git history and should therefore
be preserved.

-- 
Martin K. Petersen	Oracle Linux Engineering

Re: [PATCH 2/3] scsi: 3w-xxxx: Fix a function name in comments

[Martin K. Petersen]

Cai,

> Use dma_map_single() instead of pci_map_single(),
> because only dma_map_single() is called here.

Same comment as the previous patch.

-- 
Martin K. Petersen	Oracle Linux Engineering

Re: [PATCH 3/3] scsi: lpfc: Fix a function name in comments

[Martin K. Petersen]

Cai,

> Use dma_map_sg() instead of pci_map_sg(),

Applied to 5.16/scsi-staging, thanks!

-- 
Martin K. Petersen	Oracle Linux Engineering

Re: [PATCH 1/3] scsi: qla1280: Fix a function name in comments

[Martin K. Petersen]

On Sat, 25 Sep 2021 20:53:21 +0800, Cai Huoqing wrote:

> Use dma_map_single() instead of pci_map_single(),
> because only dma_map_single() is called here.
> 
> 

Applied to 5.16/scsi-queue, thanks!

[3/3] scsi: lpfc: Fix a function name in comments
      https://git.kernel.org/mkp/scsi/c/8d807a068090

-- 
Martin K. Petersen	Oracle Linux Engineering