change system file

hc

2024-10-09 244b2c5ca8b14627e4a17755e5922221e121c771

 kernel/drivers/tty/nozomi.c
..
..
@@ -301,7 +301,7 @@
301
301
 	unsigned int DCD:1;
302
302
 	unsigned int RI:1;
303
303
 	unsigned int CTS:1;
304
-	unsigned int reserverd:4;
304
+	unsigned int reserved:4;
305
305
 	u8 port;
306
306
 } __attribute__ ((packed));
307
307
 
..
..
@@ -839,40 +839,39 @@
839
839
 	static char buf[TMP_BUF_MAX];
840
840
 	char *p = buf;
841
841
 
842
-	interrupt & MDM_DL1 ? p += snprintf(p, TMP_BUF_MAX, "MDM_DL1 ") : NULL;
843
-	interrupt & MDM_DL2 ? p += snprintf(p, TMP_BUF_MAX - (p - buf),
844
-					"MDM_DL2 ") : NULL;
842
+	if (interrupt & MDM_DL1)
843
+		p += scnprintf(p, TMP_BUF_MAX, "MDM_DL1 ");
844
+	if (interrupt & MDM_DL2)
845
+		p += scnprintf(p, TMP_BUF_MAX - (p - buf), "MDM_DL2 ");
846
+	if (interrupt & MDM_UL1)
847
+		p += scnprintf(p, TMP_BUF_MAX - (p - buf), "MDM_UL1 ");
848
+	if (interrupt & MDM_UL2)
849
+		p += scnprintf(p, TMP_BUF_MAX - (p - buf), "MDM_UL2 ");
850
+	if (interrupt & DIAG_DL1)
851
+		p += scnprintf(p, TMP_BUF_MAX - (p - buf), "DIAG_DL1 ");
852
+	if (interrupt & DIAG_DL2)
853
+		p += scnprintf(p, TMP_BUF_MAX - (p - buf), "DIAG_DL2 ");
845
854
 
846
-	interrupt & MDM_UL1 ? p += snprintf(p, TMP_BUF_MAX - (p - buf),
847
-					"MDM_UL1 ") : NULL;
848
-	interrupt & MDM_UL2 ? p += snprintf(p, TMP_BUF_MAX - (p - buf),
849
-					"MDM_UL2 ") : NULL;
855
+	if (interrupt & DIAG_UL)
856
+		p += scnprintf(p, TMP_BUF_MAX - (p - buf), "DIAG_UL ");
850
857
 
851
-	interrupt & DIAG_DL1 ? p += snprintf(p, TMP_BUF_MAX - (p - buf),
852
-					"DIAG_DL1 ") : NULL;
853
-	interrupt & DIAG_DL2 ? p += snprintf(p, TMP_BUF_MAX - (p - buf),
854
-					"DIAG_DL2 ") : NULL;
858
+	if (interrupt & APP1_DL)
859
+		p += scnprintf(p, TMP_BUF_MAX - (p - buf), "APP1_DL ");
860
+	if (interrupt & APP2_DL)
861
+		p += scnprintf(p, TMP_BUF_MAX - (p - buf), "APP2_DL ");
855
862
 
856
-	interrupt & DIAG_UL ? p += snprintf(p, TMP_BUF_MAX - (p - buf),
857
-					"DIAG_UL ") : NULL;
863
+	if (interrupt & APP1_UL)
864
+		p += scnprintf(p, TMP_BUF_MAX - (p - buf), "APP1_UL ");
865
+	if (interrupt & APP2_UL)
866
+		p += scnprintf(p, TMP_BUF_MAX - (p - buf), "APP2_UL ");
858
867
 
859
-	interrupt & APP1_DL ? p += snprintf(p, TMP_BUF_MAX - (p - buf),
860
-					"APP1_DL ") : NULL;
861
-	interrupt & APP2_DL ? p += snprintf(p, TMP_BUF_MAX - (p - buf),
862
-					"APP2_DL ") : NULL;
868
+	if (interrupt & CTRL_DL)
869
+		p += scnprintf(p, TMP_BUF_MAX - (p - buf), "CTRL_DL ");
870
+	if (interrupt & CTRL_UL)
871
+		p += scnprintf(p, TMP_BUF_MAX - (p - buf), "CTRL_UL ");
863
872
 
864
-	interrupt & APP1_UL ? p += snprintf(p, TMP_BUF_MAX - (p - buf),
865
-					"APP1_UL ") : NULL;
866
-	interrupt & APP2_UL ? p += snprintf(p, TMP_BUF_MAX - (p - buf),
867
-					"APP2_UL ") : NULL;
868
-
869
-	interrupt & CTRL_DL ? p += snprintf(p, TMP_BUF_MAX - (p - buf),
870
-					"CTRL_DL ") : NULL;
871
-	interrupt & CTRL_UL ? p += snprintf(p, TMP_BUF_MAX - (p - buf),
872
-					"CTRL_UL ") : NULL;
873
-
874
-	interrupt & RESET ? p += snprintf(p, TMP_BUF_MAX - (p - buf),
875
-					"RESET ") : NULL;
873
+	if (interrupt & RESET)
874
+		p += scnprintf(p, TMP_BUF_MAX - (p - buf), "RESET ");
876
875
 
877
876
 	return buf;
878
877
 }
..
..
@@ -1282,7 +1281,7 @@
1282
1281
 static ssize_t card_type_show(struct device *dev, struct device_attribute *attr,
1283
1282
 			  char *buf)
1284
1283
 {
1285
-	const struct nozomi *dc = pci_get_drvdata(to_pci_dev(dev));
1284
+	const struct nozomi *dc = dev_get_drvdata(dev);
1286
1285
 
1287
1286
 	return sprintf(buf, "%d\n", dc->card_type);
1288
1287
 }
..
..
@@ -1291,7 +1290,7 @@
1291
1290
 static ssize_t open_ttys_show(struct device *dev, struct device_attribute *attr,
1292
1291
 			  char *buf)
1293
1292
 {
1294
-	const struct nozomi *dc = pci_get_drvdata(to_pci_dev(dev));
1293
+	const struct nozomi *dc = dev_get_drvdata(dev);
1295
1294
 
1296
1295
 	return sprintf(buf, "%u\n", dc->open_ttys);
1297
1296
 }
..
..
@@ -1317,7 +1316,6 @@
1317
1316
 static int nozomi_card_init(struct pci_dev *pdev,
1318
1317
 				      const struct pci_device_id *ent)
1319
1318
 {
1320
-	resource_size_t start;
1321
1319
 	int ret;
1322
1320
 	struct nozomi *dc = NULL;
1323
1321
 	int ndev_idx;
..
..
@@ -1357,17 +1355,10 @@
1357
1355
 		goto err_disable_device;
1358
1356
 	}
1359
1357
 
1360
-	start = pci_resource_start(dc->pdev, 0);
1361
-	if (start == 0) {
1362
-		dev_err(&pdev->dev, "No I/O address for card detected\n");
1363
-		ret = -ENODEV;
1364
-		goto err_rel_regs;
1365
-	}
1366
-
1367
1358
 	/* Find out what card type it is */
1368
1359
 	nozomi_get_card_type(dc);
1369
1360
 
1370
-	dc->base_addr = ioremap_nocache(start, dc->card_type);
1361
+	dc->base_addr = pci_iomap(dc->pdev, 0, dc->card_type);
1371
1362
 	if (!dc->base_addr) {
1372
1363
 		dev_err(&pdev->dev, "Unable to map card MMIO\n");
1373
1364
 		ret = -ENODEV;