forked from ~ljy/RK356X_SDK_RELEASE

blame | history | patch | commit | commitdiff
hc
2024-02-20 102a0743326a03cd1a1202ceda21e175b7d3575c 
 kernel/drivers/scsi/snic/snic_scsi.c
....@@ -146,10 +146,10 @@
146146 		      CMD_FLAGS(sc));
147147 
148148 	if (req->u.icmnd.sense_addr)
149
-		pci_unmap_single(snic->pdev,
149
+		dma_unmap_single(&snic->pdev->dev,
150150 				 le64_to_cpu(req->u.icmnd.sense_addr),
151151 				 SCSI_SENSE_BUFFERSIZE,
152
-				 PCI_DMA_FROMDEVICE);
152
+				 DMA_FROM_DEVICE);
153153 
154154 	scsi_dma_unmap(sc);
155155 
....@@ -185,12 +185,11 @@
185185 		}
186186 	}
187187 
188
-	pa = pci_map_single(snic->pdev,
188
+	pa = dma_map_single(&snic->pdev->dev,
189189 			    sc->sense_buffer,
190190 			    SCSI_SENSE_BUFFERSIZE,
191
-			    PCI_DMA_FROMDEVICE);
192
-
193
-	if (pci_dma_mapping_error(snic->pdev, pa)) {
191
+			    DMA_FROM_DEVICE);
192
+	if (dma_mapping_error(&snic->pdev->dev, pa)) {
194193 		SNIC_HOST_ERR(snic->shost,
195194 			      "QIcmnd:PCI Map Failed for sns buf %p tag %x\n",
196195 			      sc->sense_buffer, snic_cmd_tag(sc));
....@@ -1388,19 +1387,15 @@
13881387 	}
13891388 
13901389 	ret = snic_queue_itmf_req(snic, tmreq, sc, tmf, req_id);
1391
-	if (ret)
1392
-		goto tmreq_err;
1393
-
1394
-	ret = 0;
13951390 
13961391 tmreq_err:
13971392 	if (ret) {
13981393 		SNIC_HOST_ERR(snic->shost,
1399
-			      "issu_tmreq: Queing ITMF(%d) Req, sc %p rqi %p req_id %d tag %x fails err = %d\n",
1394
+			      "issu_tmreq: Queueing ITMF(%d) Req, sc %p rqi %p req_id %d tag %x fails err = %d\n",
14001395 			      tmf, sc, rqi, req_id, tag, ret);
14011396 	} else {
14021397 		SNIC_SCSI_DBG(snic->shost,
1403
-			      "issu_tmreq: Queuing ITMF(%d) Req, sc %p, rqi %p, req_id %d tag %x - Success.\n",
1398
+			      "issu_tmreq: Queueing ITMF(%d) Req, sc %p, rqi %p, req_id %d tag %x - Success.\n",
14041399 			      tmf, sc, rqi, req_id, tag);
14051400 	}
14061401 
....@@ -2001,7 +1996,7 @@
20011996 	}
20021997 
20031998 dr_failed:
2004
-	SNIC_BUG_ON(!spin_is_locked(io_lock));
1999
+	lockdep_assert_held(io_lock);
20052000 	if (rqi)
20062001 		CMD_SP(sc) = NULL;
20072002 	spin_unlock_irqrestore(io_lock, flags);
....@@ -2604,7 +2599,7 @@
26042599 	ret = SUCCESS;
26052600 
26062601 skip_internal_abts:
2607
-	SNIC_BUG_ON(!spin_is_locked(io_lock));
2602
+	lockdep_assert_held(io_lock);
26082603 	spin_unlock_irqrestore(io_lock, flags);
26092604 
26102605 	return ret;