write in 30M

hc

2024-02-20 ea08eeccae9297f7aabd2ef7f0c2517ac4549acc

 kernel/drivers/ata/pata_arasan_cf.c
..
..
@@ -219,7 +219,6 @@
219
219
 
220
220
 static struct scsi_host_template arasan_cf_sht = {
221
221
 	ATA_BASE_SHT(DRIVER_NAME),
222
-	.sg_tablesize = SG_NONE,
223
222
 	.dma_boundary = 0xFFFFFFFFUL,
224
223
 };
225
224
 
..
..
@@ -527,9 +526,11 @@
527
526
 
528
527
 	/* request dma channels */
529
528
 	/* dma_request_channel may sleep, so calling from process context */
530
-	acdev->dma_chan = dma_request_slave_channel(acdev->host->dev, "data");
531
-	if (!acdev->dma_chan) {
532
-		dev_err(acdev->host->dev, "Unable to get dma_chan\n");
529
+	acdev->dma_chan = dma_request_chan(acdev->host->dev, "data");
530
+	if (IS_ERR(acdev->dma_chan)) {
531
+		dev_err_probe(acdev->host->dev, PTR_ERR(acdev->dma_chan),
532
+			      "Unable to get dma_chan\n");
533
+		acdev->dma_chan = NULL;
533
534
 		goto chan_request_fail;
534
535
 	}
535
536
 
..
..
@@ -540,6 +541,7 @@
540
541
 	}
541
542
 
542
543
 	dma_release_channel(acdev->dma_chan);
544
+	acdev->dma_chan = NULL;
543
545
 
544
546
 	/* data xferred successfully */
545
547
 	if (!ret) {
..
..
@@ -832,7 +834,7 @@
832
834
 	}
833
835
 
834
836
 	acdev->pbase = res->start;
835
-	acdev->vbase = devm_ioremap_nocache(&pdev->dev, res->start,
837
+	acdev->vbase = devm_ioremap(&pdev->dev, res->start,
836
838
 			resource_size(res));
837
839
 	if (!acdev->vbase) {
838
840
 		dev_warn(&pdev->dev, "ioremap fail\n");