hc
2023-12-11 d2ccde1c8e90d38cee87a1b0309ad2827f3fd30d
kernel/drivers/char/pcmcia/cm4000_cs.c
....@@ -530,7 +530,7 @@
530530 DEBUGP(5, dev, "NumRecBytes is valid\n");
531531 break;
532532 }
533
- mdelay(10);
533
+ usleep_range(10000, 11000);
534534 }
535535 if (i == 100) {
536536 DEBUGP(5, dev, "Timeout waiting for NumRecBytes getting "
....@@ -550,7 +550,7 @@
550550 }
551551 break;
552552 }
553
- mdelay(10);
553
+ usleep_range(10000, 11000);
554554 }
555555
556556 /* check whether it is a short PTS reply? */
....@@ -735,8 +735,9 @@
735735 }
736736
737737 switch (dev->mstate) {
738
+ case M_CARDOFF: {
738739 unsigned char flags0;
739
- case M_CARDOFF:
740
+
740741 DEBUGP(4, dev, "M_CARDOFF\n");
741742 flags0 = inb(REG_FLAGS0(iobase));
742743 if (flags0 & 0x02) {
....@@ -759,6 +760,7 @@
759760 dev->mdelay = T_50MSEC;
760761 }
761762 break;
763
+ }
762764 case M_FETCH_ATR:
763765 DEBUGP(4, dev, "M_FETCH_ATR\n");
764766 xoutb(0x80, REG_FLAGS0(iobase));
....@@ -1406,7 +1408,6 @@
14061408 unsigned int iobase = dev->p_dev->resource[0]->start;
14071409 struct inode *inode = file_inode(filp);
14081410 struct pcmcia_device *link;
1409
- int size;
14101411 int rc;
14111412 void __user *argp = (void __user *)arg;
14121413 #ifdef CM4000_DEBUG
....@@ -1442,19 +1443,6 @@
14421443 if (_IOC_NR(cmd) > CM_IOC_MAXNR) {
14431444 DEBUGP(4, dev, "iocnr mismatch\n");
14441445 goto out;
1445
- }
1446
- size = _IOC_SIZE(cmd);
1447
- rc = -EFAULT;
1448
- DEBUGP(4, dev, "iocdir=%.4x iocr=%.4x iocw=%.4x iocsize=%d cmd=%.4x\n",
1449
- _IOC_DIR(cmd), _IOC_READ, _IOC_WRITE, size, cmd);
1450
-
1451
- if (_IOC_DIR(cmd) & _IOC_READ) {
1452
- if (!access_ok(VERIFY_WRITE, argp, size))
1453
- goto out;
1454
- }
1455
- if (_IOC_DIR(cmd) & _IOC_WRITE) {
1456
- if (!access_ok(VERIFY_READ, argp, size))
1457
- goto out;
14581446 }
14591447 rc = 0;
14601448
....@@ -1686,7 +1674,7 @@
16861674 link->open = 1; /* only one open per device */
16871675
16881676 DEBUGP(2, dev, "<- cmm_open\n");
1689
- ret = nonseekable_open(inode, filp);
1677
+ ret = stream_open(inode, filp);
16901678 out:
16911679 mutex_unlock(&cmm_mutex);
16921680 return ret;