[PATCH] Remove unused code from rioctrl.c (Last for this batch of work)

+1 -110

1 changed file

expand all

drivers

char

rio

rioctrl.c

+1 -110

drivers/char/rio/rioctrl.c

··· 308 308 } 309 309 310 310 case RIO_DEBUG_MEM: 311 - #ifdef DEBUG_MEM_SUPPORT 312 - RIO_DEBUG_CTRL, if (su) 313 - return rio_RIODebugMemory(RIO_DEBUG_CTRL, arg); 314 - else 315 - #endif 316 - return -EPERM; 311 + return -EPERM; 317 312 318 313 case RIO_ALL_MODEM: 319 314 rio_dprintk(RIO_DEBUG_CTRL, "RIO_ALL_MODEM\n"); ··· 586 591 587 592 case RIO_GET_LOG: 588 593 rio_dprintk(RIO_DEBUG_CTRL, "RIO_GET_LOG\n"); 589 - #ifdef LOGGING 590 - RIOGetLog(arg); 591 - return 0; 592 - #else 593 594 return -EINVAL; 594 - #endif 595 595 596 596 case RIO_GET_MODTYPE: 597 597 if (copyin((int) arg, (caddr_t) & port, sizeof(uint)) == COPYFAIL) { ··· 674 684 rio_dprintk(RIO_DEBUG_CTRL, "entering loop (%d %d)!\n", PortSetup.From, PortSetup.To); 675 685 for (loop = PortSetup.From; loop <= PortSetup.To; loop++) { 676 686 rio_dprintk(RIO_DEBUG_CTRL, "in loop (%d)!\n", loop); 677 - #if 0 678 - PortP = p->RIOPortp[loop]; 679 - if (!PortP->TtyP) 680 - PortP->TtyP = &p->channel[loop]; 681 - 682 - rio_spin_lock_irqsave(&PortP->portSem, flags); 683 - if (PortSetup.IxAny) 684 - PortP->Config |= RIO_IXANY; 685 - else 686 - PortP->Config &= ~RIO_IXANY; 687 - if (PortSetup.IxOn) 688 - PortP->Config |= RIO_IXON; 689 - else 690 - PortP->Config &= ~RIO_IXON; 691 - 692 - /* 693 - ** If the port needs to wait for all a processes output 694 - ** to drain before closing then this flag will be set. 695 - */ 696 - if (PortSetup.Drain) { 697 - PortP->Config |= RIO_WAITDRAIN; 698 - } else { 699 - PortP->Config &= ~RIO_WAITDRAIN; 700 - } 701 - /* 702 - ** Store settings if locking or unlocking port or if the 703 - ** port is not locked, when setting the store option. 704 - */ 705 - if (PortP->Mapped && ((PortSetup.Lock && !PortP->Lock) || (!PortP->Lock && (PortSetup.Store && !PortP->Store)))) { 706 - PortP->StoredTty.iflag = PortP->TtyP->tm.c_iflag; 707 - PortP->StoredTty.oflag = PortP->TtyP->tm.c_oflag; 708 - PortP->StoredTty.cflag = PortP->TtyP->tm.c_cflag; 709 - PortP->StoredTty.lflag = PortP->TtyP->tm.c_lflag; 710 - PortP->StoredTty.line = PortP->TtyP->tm.c_line; 711 - bcopy(PortP->TtyP->tm.c_cc, PortP->StoredTty.cc, NCC + 5); 712 - } 713 - PortP->Lock = PortSetup.Lock; 714 - PortP->Store = PortSetup.Store; 715 - PortP->Xprint.XpCps = PortSetup.XpCps; 716 - bcopy(PortSetup.XpOn, PortP->Xprint.XpOn, MAX_XP_CTRL_LEN); 717 - bcopy(PortSetup.XpOff, PortP->Xprint.XpOff, MAX_XP_CTRL_LEN); 718 - PortP->Xprint.XpOn[MAX_XP_CTRL_LEN - 1] = '\0'; 719 - PortP->Xprint.XpOff[MAX_XP_CTRL_LEN - 1] = '\0'; 720 - PortP->Xprint.XpLen = RIOStrlen(PortP->Xprint.XpOn) + RIOStrlen(PortP->Xprint.XpOff); 721 - rio_spin_unlock_irqrestore(&PortP->portSem, flags); 722 - #endif 723 687 } 724 688 rio_dprintk(RIO_DEBUG_CTRL, "after loop (%d)!\n", loop); 725 689 rio_dprintk(RIO_DEBUG_CTRL, "Retval:%x\n", retval); ··· 745 801 746 802 rio_dprintk(RIO_DEBUG_CTRL, "Port %d\n", PortTty.port); 747 803 PortP = (p->RIOPortp[PortTty.port]); 748 - #if 0 749 - PortTty.Tty.tm.c_iflag = PortP->TtyP->tm.c_iflag; 750 - PortTty.Tty.tm.c_oflag = PortP->TtyP->tm.c_oflag; 751 - PortTty.Tty.tm.c_cflag = PortP->TtyP->tm.c_cflag; 752 - PortTty.Tty.tm.c_lflag = PortP->TtyP->tm.c_lflag; 753 - #endif 754 804 if (copyout((caddr_t) & PortTty, (int) arg, sizeof(struct PortTty)) == COPYFAIL) { 755 805 p->RIOError.Error = COPYOUT_FAILED; 756 806 return -EFAULT; ··· 762 824 return -ENXIO; 763 825 } 764 826 PortP = (p->RIOPortp[PortTty.port]); 765 - #if 0 766 - rio_spin_lock_irqsave(&PortP->portSem, flags); 767 - PortP->TtyP->tm.c_iflag = PortTty.Tty.tm.c_iflag; 768 - PortP->TtyP->tm.c_oflag = PortTty.Tty.tm.c_oflag; 769 - PortP->TtyP->tm.c_cflag = PortTty.Tty.tm.c_cflag; 770 - PortP->TtyP->tm.c_lflag = PortTty.Tty.tm.c_lflag; 771 - rio_spin_unlock_irqrestore(&PortP->portSem, flags); 772 - #endif 773 - 774 827 RIOParam(PortP, CONFIG, PortP->State & RIO_MODEM, OK_TO_SLEEP); 775 828 return retval; 776 829 ··· 837 908 PortP->statsGather = portStats.gather; 838 909 rio_spin_unlock_irqrestore(&PortP->portSem, flags); 839 910 return retval; 840 - 841 - #ifdef DEBUG_SUPPORTED 842 - case RIO_READ_LEVELS: 843 - { 844 - int num; 845 - rio_dprintk(RIO_DEBUG_CTRL, "RIO_READ_LEVELS\n"); 846 - for (num = 0; RIODbInf[num].Flag; num++); 847 - rio_dprintk(RIO_DEBUG_CTRL, "%d levels to copy\n", num); 848 - if (copyout((caddr_t) RIODbInf, (int) arg, sizeof(struct DbInf) * (num + 1)) == COPYFAIL) { 849 - rio_dprintk(RIO_DEBUG_CTRL, "ReadLevels Copy failed\n"); 850 - p->RIOError.Error = COPYOUT_FAILED; 851 - return -EFAULT; 852 - } 853 - rio_dprintk(RIO_DEBUG_CTRL, "%d levels to copied\n", num); 854 - return retval; 855 - } 856 - #endif 857 911 858 912 case RIO_READ_CONFIG: 859 913 rio_dprintk(RIO_DEBUG_CTRL, "RIO_READ_CONFIG\n"); ··· 996 1084 (void) RIOBoardTest(p->RIOHosts[Host].PaddrP, p->RIOHosts[Host].Caddr, p->RIOHosts[Host].Type, p->RIOHosts[Host].Slot); 997 1085 bzero((caddr_t) & p->RIOHosts[Host].Flags, ((int) &p->RIOHosts[Host].____end_marker____) - ((int) &p->RIOHosts[Host].Flags)); 998 1086 p->RIOHosts[Host].Flags = RC_WAITING; 999 - #if 0 1000 - RIOSetupDataStructs(p); 1001 - #endif 1002 1087 } 1003 1088 RIOFoadWakeup(p); 1004 1089 p->RIONumBootPkts = 0; 1005 1090 p->RIOBooting = 0; 1006 - 1007 - #ifdef RINGBUFFER_SUPPORT 1008 - for (loop = 0; loop < RIO_PORTS; loop++) 1009 - if (p->RIOPortp[loop]->TxRingBuffer) 1010 - sysfree((void *) p->RIOPortp[loop]->TxRingBuffer, RIOBufferSize); 1011 - #endif 1012 - #if 0 1013 - bzero((caddr_t) & p->RIOPortp[0], RIO_PORTS * sizeof(struct Port)); 1014 - #else 1015 1091 printk("HEEEEELP!\n"); 1016 - #endif 1017 1092 1018 1093 for (loop = 0; loop < RIO_PORTS; loop++) { 1019 - #if 0 1020 - p->RIOPortp[loop]->TtyP = &p->channel[loop]; 1021 - #endif 1022 - 1023 1094 spin_lock_init(&p->RIOPortp[loop]->portSem); 1024 1095 p->RIOPortp[loop]->InUse = NOT_INUSE; 1025 1096 } ··· 1547 1652 int Ret; 1548 1653 ushort rup; 1549 1654 int port; 1550 - 1551 - #ifdef CHECK 1552 - CheckPortP(PortP); 1553 - #endif 1554 1655 1555 1656 if (PortP->State & RIO_DELETED) { 1556 1657 rio_dprintk(RIO_DEBUG_CTRL, "Preemptive command to deleted RTA ignored\n");

Configure Feed

Configure Feed