update kernel to 5.10.198

hc

2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf

 kernel/drivers/scsi/atp870u.c
..
..
@@ -1,3 +1,4 @@
1
+// SPDX-License-Identifier: GPL-2.0-only
1
2
 /* 
2
3
  *  Copyright (C) 1997	Wu Ching Chen
3
4
  *  2.1.x update (C) 1998  Krzysztof G. Baranowski
..
..
@@ -194,12 +195,11 @@
194
195
 				((unsigned char *) &adrcnt)[2] = atp_readb_io(dev, c, 0x12);
195
196
 				((unsigned char *) &adrcnt)[1] = atp_readb_io(dev, c, 0x13);
196
197
 				((unsigned char *) &adrcnt)[0] = atp_readb_io(dev, c, 0x14);
197
-				if (dev->id[c][target_id].last_len != adrcnt)
198
-				{
199
-			   		k = dev->id[c][target_id].last_len;
198
+				if (dev->id[c][target_id].last_len != adrcnt) {
199
+					k = dev->id[c][target_id].last_len;
200
200
 			   		k -= adrcnt;
201
201
 			   		dev->id[c][target_id].tran_len = k;			   
202
-			   	dev->id[c][target_id].last_len = adrcnt;			   
202
+					dev->id[c][target_id].last_len = adrcnt;
203
203
 				}
204
204
 #ifdef ED_DBGP
205
205
 				printk("dev->id[c][target_id].last_len = %d dev->id[c][target_id].tran_len = %d\n",dev->id[c][target_id].last_len,dev->id[c][target_id].tran_len);
..
..
@@ -1193,7 +1193,7 @@
1193
1193
 		for (k = 0; k < 16; k++) {
1194
1194
 			if (!atp_dev->id[j][k].prd_table)
1195
1195
 				continue;
1196
-			pci_free_consistent(atp_dev->pdev, 1024, atp_dev->id[j][k].prd_table, atp_dev->id[j][k].prd_bus);
1196
+			dma_free_coherent(&atp_dev->pdev->dev, 1024, atp_dev->id[j][k].prd_table, atp_dev->id[j][k].prd_bus);
1197
1197
 			atp_dev->id[j][k].prd_table = NULL;
1198
1198
 		}
1199
1199
 	}
..
..
@@ -1205,7 +1205,7 @@
1205
1205
 	int c,k;
1206
1206
 	for(c=0;c < 2;c++) {
1207
1207
 	   	for(k=0;k<16;k++) {
1208
-	   			atp_dev->id[c][k].prd_table = pci_alloc_consistent(atp_dev->pdev, 1024, &(atp_dev->id[c][k].prd_bus));
1208
+				atp_dev->id[c][k].prd_table = dma_alloc_coherent(&atp_dev->pdev->dev, 1024, &(atp_dev->id[c][k].prd_bus), GFP_KERNEL);
1209
1209
 	   			if (!atp_dev->id[c][k].prd_table) {
1210
1210
 	   				printk("atp870u_init_tables fail\n");
1211
1211
 				atp870u_free_tables(host);
..
..
@@ -1509,7 +1509,7 @@
1509
1509
 	if (err)
1510
1510
 		goto fail;
1511
1511
 
1512
-	if (pci_set_dma_mask(pdev, DMA_BIT_MASK(32))) {
1512
+	if (dma_set_mask(&pdev->dev, DMA_BIT_MASK(32))) {
1513
1513
                 printk(KERN_ERR "atp870u: DMA mask required but not available.\n");
1514
1514
                 err = -EIO;
1515
1515
                 goto disable_device;
..
..
@@ -1680,8 +1680,7 @@
1680
1680
      .bios_param        	= atp870u_biosparam	/* biosparm */,
1681
1681
      .can_queue         	= qcnt			/* can_queue */,
1682
1682
      .this_id           	= 7			/* SCSI ID */,
1683
-     .sg_tablesize      	= ATP870U_SCATTER	/*SG_ALL*/ /*SG_NONE*/,
1684
-     .use_clustering    	= ENABLE_CLUSTERING,
1683
+     .sg_tablesize      	= ATP870U_SCATTER	/*SG_ALL*/,
1685
1684
      .max_sectors		= ATP870U_MAX_SECTORS,
1686
1685
 };
1687
1686