forked from ~ljy/RK356X_SDK_RELEASE

hc
2024-05-13 9d77db3c730780c8ef5ccd4b66403ff5675cfe4e
kernel/drivers/scsi/pcmcia/nsp_cs.c
....@@ -56,9 +56,7 @@
5656 MODULE_AUTHOR("YOKOTA Hiroshi <yokota@netlab.is.tsukuba.ac.jp>");
5757 MODULE_DESCRIPTION("WorkBit NinjaSCSI-3 / NinjaSCSI-32Bi(16bit) PCMCIA SCSI host adapter module");
5858 MODULE_SUPPORTED_DEVICE("sd,sr,sg,st");
59
-#ifdef MODULE_LICENSE
6059 MODULE_LICENSE("GPL");
61
-#endif
6260
6361 #include "nsp_io.h"
6462
....@@ -86,7 +84,7 @@
8684 .can_queue = 1,
8785 .this_id = NSP_INITIATOR_ID,
8886 .sg_tablesize = SG_ALL,
89
- .use_clustering = DISABLE_CLUSTERING,
87
+ .dma_boundary = PAGE_SIZE - 1,
9088 };
9189
9290 static nsp_hw_data nsp_data_base; /* attach <-> detect glue */
....@@ -136,6 +134,7 @@
136134 scsi_set_resid(SCpnt, scsi_get_resid(SCpnt) + residInc);
137135 }
138136
137
+__printf(4, 5)
139138 static void nsp_cs_message(const char *func, int line, char *type, char *fmt, ...)
140139 {
141140 va_list args;
....@@ -691,14 +690,14 @@
691690 {
692691 unsigned int base = SCpnt->device->host->io_port;
693692 unsigned int count;
694
- unsigned int l, m, h, dummy;
693
+ unsigned int l, m, h;
695694
696695 nsp_index_write(base, POINTERCLR, POINTER_CLEAR | ACK_COUNTER);
697696
698697 l = nsp_index_read(base, TRANSFERCOUNT);
699698 m = nsp_index_read(base, TRANSFERCOUNT);
700699 h = nsp_index_read(base, TRANSFERCOUNT);
701
- dummy = nsp_index_read(base, TRANSFERCOUNT); /* required this! */
700
+ nsp_index_read(base, TRANSFERCOUNT); /* required this! */
702701
703702 count = (h << 16) | (m << 8) | (l << 0);
704703
....@@ -789,7 +788,7 @@
789788 SCpnt->SCp.buffers_residual != 0 ) {
790789 //nsp_dbg(NSP_DEBUG_DATA_IO, "scatterlist next timeout=%d", time_out);
791790 SCpnt->SCp.buffers_residual--;
792
- SCpnt->SCp.buffer++;
791
+ SCpnt->SCp.buffer = sg_next(SCpnt->SCp.buffer);
793792 SCpnt->SCp.ptr = BUFFER_ADDR;
794793 SCpnt->SCp.this_residual = SCpnt->SCp.buffer->length;
795794 time_out = 1000;
....@@ -887,7 +886,7 @@
887886 SCpnt->SCp.buffers_residual != 0 ) {
888887 //nsp_dbg(NSP_DEBUG_DATA_IO, "scatterlist next");
889888 SCpnt->SCp.buffers_residual--;
890
- SCpnt->SCp.buffer++;
889
+ SCpnt->SCp.buffer = sg_next(SCpnt->SCp.buffer);
891890 SCpnt->SCp.ptr = BUFFER_ADDR;
892891 SCpnt->SCp.this_residual = SCpnt->SCp.buffer->length;
893892 time_out = 1000;
....@@ -1114,7 +1113,7 @@
11141113 nsp_scsi_done(tmpSC);
11151114 return IRQ_HANDLED;
11161115 }
1117
- /* fall thru */
1116
+ fallthrough;
11181117 default:
11191118 if ((irq_status & (IRQSTATUS_SCSI | IRQSTATUS_FIFO)) == 0) {
11201119 return IRQ_HANDLED;
....@@ -1134,7 +1133,8 @@
11341133
11351134 //*sync_neg = SYNC_NOT_YET;
11361135
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) {
11381138 tmpSC->result = (DID_OK << 16) |
11391139 ((tmpSC->SCp.Message & 0xff) << 8) |
11401140 ((tmpSC->SCp.Status & 0xff) << 0);
....@@ -1561,7 +1561,7 @@
15611561 goto next_entry;
15621562
15631563 data->MmioAddress = (unsigned long)
1564
- ioremap_nocache(p_dev->resource[2]->start,
1564
+ ioremap(p_dev->resource[2]->start,
15651565 resource_size(p_dev->resource[2]));
15661566 data->MmioLength = resource_size(p_dev->resource[2]);
15671567 }
....@@ -1742,19 +1742,6 @@
17421742 .suspend = nsp_cs_suspend,
17431743 .resume = nsp_cs_resume,
17441744 };
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);
17591746
17601747 /* end */