change system file

hc

2024-10-09 244b2c5ca8b14627e4a17755e5922221e121c771

 kernel/drivers/scsi/pcmcia/nsp_cs.c
..
..
@@ -56,9 +56,7 @@
56
56
 MODULE_AUTHOR("YOKOTA Hiroshi <yokota@netlab.is.tsukuba.ac.jp>");
57
57
 MODULE_DESCRIPTION("WorkBit NinjaSCSI-3 / NinjaSCSI-32Bi(16bit) PCMCIA SCSI host adapter module");
58
58
 MODULE_SUPPORTED_DEVICE("sd,sr,sg,st");
59
-#ifdef MODULE_LICENSE
60
59
 MODULE_LICENSE("GPL");
61
-#endif
62
60
 
63
61
 #include "nsp_io.h"
64
62
 
..
..
@@ -86,7 +84,7 @@
86
84
 	.can_queue		 = 1,
87
85
 	.this_id		 = NSP_INITIATOR_ID,
88
86
 	.sg_tablesize		 = SG_ALL,
89
-	.use_clustering		 = DISABLE_CLUSTERING,
87
+	.dma_boundary		 = PAGE_SIZE - 1,
90
88
 };
91
89
 
92
90
 static nsp_hw_data nsp_data_base; /* attach <-> detect glue */
..
..
@@ -136,6 +134,7 @@
136
134
 	scsi_set_resid(SCpnt, scsi_get_resid(SCpnt) + residInc);
137
135
 }
138
136
 
137
+__printf(4, 5)
139
138
 static void nsp_cs_message(const char *func, int line, char *type, char *fmt, ...)
140
139
 {
141
140
 	va_list args;
..
..
@@ -691,14 +690,14 @@
691
690
 {
692
691
 	unsigned int base = SCpnt->device->host->io_port;
693
692
 	unsigned int count;
694
-	unsigned int l, m, h, dummy;
693
+	unsigned int l, m, h;
695
694
 
696
695
 	nsp_index_write(base, POINTERCLR, POINTER_CLEAR | ACK_COUNTER);
697
696
 
698
697
 	l     = nsp_index_read(base, TRANSFERCOUNT);
699
698
 	m     = nsp_index_read(base, TRANSFERCOUNT);
700
699
 	h     = nsp_index_read(base, TRANSFERCOUNT);
701
-	dummy = nsp_index_read(base, TRANSFERCOUNT); /* required this! */
700
+	nsp_index_read(base, TRANSFERCOUNT); /* required this! */
702
701
 
703
702
 	count = (h << 16) | (m << 8) | (l << 0);
704
703
 
..
..
@@ -789,7 +788,7 @@
789
788
 		    SCpnt->SCp.buffers_residual != 0 ) {
790
789
 			//nsp_dbg(NSP_DEBUG_DATA_IO, "scatterlist next timeout=%d", time_out);
791
790
 			SCpnt->SCp.buffers_residual--;
792
-			SCpnt->SCp.buffer++;
791
+			SCpnt->SCp.buffer = sg_next(SCpnt->SCp.buffer);
793
792
 			SCpnt->SCp.ptr		 = BUFFER_ADDR;
794
793
 			SCpnt->SCp.this_residual = SCpnt->SCp.buffer->length;
795
794
 			time_out = 1000;
..
..
@@ -887,7 +886,7 @@
887
886
 		    SCpnt->SCp.buffers_residual != 0 ) {
888
887
 			//nsp_dbg(NSP_DEBUG_DATA_IO, "scatterlist next");
889
888
 			SCpnt->SCp.buffers_residual--;
890
-			SCpnt->SCp.buffer++;
889
+			SCpnt->SCp.buffer = sg_next(SCpnt->SCp.buffer);
891
890
 			SCpnt->SCp.ptr		 = BUFFER_ADDR;
892
891
 			SCpnt->SCp.this_residual = SCpnt->SCp.buffer->length;
893
892
 			time_out = 1000;
..
..
@@ -1114,7 +1113,7 @@
1114
1113
 			nsp_scsi_done(tmpSC);
1115
1114
 			return IRQ_HANDLED;
1116
1115
 		}
1117
-		/* fall thru */
1116
+		fallthrough;
1118
1117
 	default:
1119
1118
 		if ((irq_status & (IRQSTATUS_SCSI | IRQSTATUS_FIFO)) == 0) {
1120
1119
 			return IRQ_HANDLED;
..
..
@@ -1134,7 +1133,8 @@
1134
1133
 
1135
1134
 		//*sync_neg       = SYNC_NOT_YET;
1136
1135
 
1137
-		if ((tmpSC->SCp.Message == MSG_COMMAND_COMPLETE)) {     /* all command complete and return status */
1136
+		/* all command complete and return status */
1137
+		if (tmpSC->SCp.Message == MSG_COMMAND_COMPLETE) {
1138
1138
 			tmpSC->result = (DID_OK		             << 16) |
1139
1139
 					((tmpSC->SCp.Message & 0xff) <<  8) |
1140
1140
 					((tmpSC->SCp.Status  & 0xff) <<  0);
..
..
@@ -1561,7 +1561,7 @@
1561
1561
 			goto next_entry;
1562
1562
 
1563
1563
 		data->MmioAddress = (unsigned long)
1564
-			ioremap_nocache(p_dev->resource[2]->start,
1564
+			ioremap(p_dev->resource[2]->start,
1565
1565
 					resource_size(p_dev->resource[2]));
1566
1566
 		data->MmioLength  = resource_size(p_dev->resource[2]);
1567
1567
 	}
..
..
@@ -1742,19 +1742,6 @@
1742
1742
 	.suspend	= nsp_cs_suspend,
1743
1743
 	.resume		= nsp_cs_resume,
1744
1744
 };
1745
-
1746
-static int __init nsp_cs_init(void)
1747
-{
1748
-	return pcmcia_register_driver(&nsp_driver);
1749
-}
1750
-
1751
-static void __exit nsp_cs_exit(void)
1752
-{
1753
-	pcmcia_unregister_driver(&nsp_driver);
1754
-}
1755
-
1756
-
1757
-module_init(nsp_cs_init)
1758
-module_exit(nsp_cs_exit)
1745
+module_pcmcia_driver(nsp_driver);
1759
1746
 
1760
1747
 /* end */