diff options
| author | Alan Cox <alan@lxorguk.ukuu.org.uk> | 2006-01-16 12:21:25 -0500 | 
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-17 02:31:28 -0500 | 
| commit | 283c9d546ed7506b03f0d9da4441145aa5f2f6f9 (patch) | |
| tree | 950375a7bb037dd133a9ad21a47a3bc41fed4f5c | |
| parent | 8b03de1f667a5c15d1e4d50318a27a67669f8980 (diff) | |
[PATCH] Remove unused CHECK code from riocmd.c
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | drivers/char/rio/riocmd.c | 30 | 
1 files changed, 0 insertions, 30 deletions
| diff --git a/drivers/char/rio/riocmd.c b/drivers/char/rio/riocmd.c index b97dd9fdb6ba..694bfb9d9378 100644 --- a/drivers/char/rio/riocmd.c +++ b/drivers/char/rio/riocmd.c | |||
| @@ -387,12 +387,6 @@ static int RIOCommandRup(struct rio_info *p, uint Rup, struct Host *HostP, PKT * | |||
| 387 | 387 | ||
| 388 | func_enter(); | 388 | func_enter(); | 
| 389 | 389 | ||
| 390 | #ifdef CHECK | ||
| 391 | CheckHost(Host); | ||
| 392 | CheckHostP(HostP); | ||
| 393 | CheckPacketP(PacketP); | ||
| 394 | #endif | ||
| 395 | |||
| 396 | /* | 390 | /* | 
| 397 | ** 16 port RTA note: | 391 | ** 16 port RTA note: | 
| 398 | ** Command rup packets coming from the RTA will have pkt->data[1] (which | 392 | ** Command rup packets coming from the RTA will have pkt->data[1] (which | 
| @@ -406,10 +400,6 @@ static int RIOCommandRup(struct rio_info *p, uint Rup, struct Host *HostP, PKT * | |||
| 406 | SysPort = UnixRupP->BaseSysPort + (RBYTE(PktCmdP->PhbNum) % (ushort) PORTS_PER_RTA); | 400 | SysPort = UnixRupP->BaseSysPort + (RBYTE(PktCmdP->PhbNum) % (ushort) PORTS_PER_RTA); | 
| 407 | rio_dprintk(RIO_DEBUG_CMD, "Command on rup %d, port %d\n", rup, SysPort); | 401 | rio_dprintk(RIO_DEBUG_CMD, "Command on rup %d, port %d\n", rup, SysPort); | 
| 408 | 402 | ||
| 409 | #ifdef CHECK | ||
| 410 | CheckRup(rup); | ||
| 411 | CheckUnixRupP(UnixRupP); | ||
| 412 | #endif | ||
| 413 | if (UnixRupP->BaseSysPort == NO_PORT) { | 403 | if (UnixRupP->BaseSysPort == NO_PORT) { | 
| 414 | rio_dprintk(RIO_DEBUG_CMD, "OBSCURE ERROR!\n"); | 404 | rio_dprintk(RIO_DEBUG_CMD, "OBSCURE ERROR!\n"); | 
| 415 | rio_dprintk(RIO_DEBUG_CMD, "Diagnostics follow. Please WRITE THESE DOWN and report them to Specialix Technical Support\n"); | 405 | rio_dprintk(RIO_DEBUG_CMD, "Diagnostics follow. Please WRITE THESE DOWN and report them to Specialix Technical Support\n"); | 
| @@ -429,9 +419,6 @@ static int RIOCommandRup(struct rio_info *p, uint Rup, struct Host *HostP, PKT * | |||
| 429 | rio_dprintk(RIO_DEBUG_CMD, "COMMAND information: Host Port Number 0x%x, " "Command Code 0x%x\n", PktCmdP->PhbNum, PktCmdP->Command); | 419 | rio_dprintk(RIO_DEBUG_CMD, "COMMAND information: Host Port Number 0x%x, " "Command Code 0x%x\n", PktCmdP->PhbNum, PktCmdP->Command); | 
| 430 | return TRUE; | 420 | return TRUE; | 
| 431 | } | 421 | } | 
| 432 | #ifdef CHECK | ||
| 433 | CheckSysPort(SysPort); | ||
| 434 | #endif | ||
| 435 | PortP = p->RIOPortp[SysPort]; | 422 | PortP = p->RIOPortp[SysPort]; | 
| 436 | rio_spin_lock_irqsave(&PortP->portSem, flags); | 423 | rio_spin_lock_irqsave(&PortP->portSem, flags); | 
| 437 | switch (RBYTE(PktCmdP->Command)) { | 424 | switch (RBYTE(PktCmdP->Command)) { | 
| @@ -604,11 +591,6 @@ int RIOQueueCmdBlk(struct Host *HostP, uint Rup, struct CmdBlk *CmdBlkP) | |||
| 604 | struct UnixRup *UnixRupP; | 591 | struct UnixRup *UnixRupP; | 
| 605 | unsigned long flags; | 592 | unsigned long flags; | 
| 606 | 593 | ||
| 607 | #ifdef CHECK | ||
| 608 | CheckHostP(HostP); | ||
| 609 | CheckRup(Rup); | ||
| 610 | CheckCmdBlkP(CmdBlkP); | ||
| 611 | #endif | ||
| 612 | if (Rup >= (ushort) (MAX_RUP + LINKS_PER_UNIT)) { | 594 | if (Rup >= (ushort) (MAX_RUP + LINKS_PER_UNIT)) { | 
| 613 | rio_dprintk(RIO_DEBUG_CMD, "Illegal rup number %d in RIOQueueCmdBlk\n", Rup); | 595 | rio_dprintk(RIO_DEBUG_CMD, "Illegal rup number %d in RIOQueueCmdBlk\n", Rup); | 
| 614 | RIOFreeCmdBlk(CmdBlkP); | 596 | RIOFreeCmdBlk(CmdBlkP); | 
| @@ -806,9 +788,6 @@ void RIOPollHostCommands(struct rio_info *p, struct Host *HostP) | |||
| 806 | ** If it returns RIO_FAIL then don't | 788 | ** If it returns RIO_FAIL then don't | 
| 807 | ** send this command yet! | 789 | ** send this command yet! | 
| 808 | */ | 790 | */ | 
| 809 | #ifdef CHECK | ||
| 810 | CheckCmdBlkP(CmdBlkP); | ||
| 811 | #endif | ||
| 812 | if (!(CmdBlkP->PreFuncP ? (*CmdBlkP->PreFuncP) (CmdBlkP->PreArg, CmdBlkP) : TRUE)) { | 791 | if (!(CmdBlkP->PreFuncP ? (*CmdBlkP->PreFuncP) (CmdBlkP->PreArg, CmdBlkP) : TRUE)) { | 
| 813 | rio_dprintk(RIO_DEBUG_CMD, "Not ready to start command 0x%x\n", (int) CmdBlkP); | 792 | rio_dprintk(RIO_DEBUG_CMD, "Not ready to start command 0x%x\n", (int) CmdBlkP); | 
| 814 | } else { | 793 | } else { | 
| @@ -816,9 +795,6 @@ void RIOPollHostCommands(struct rio_info *p, struct Host *HostP) | |||
| 816 | /* | 795 | /* | 
| 817 | ** Whammy! blat that pack! | 796 | ** Whammy! blat that pack! | 
| 818 | */ | 797 | */ | 
| 819 | #ifdef CHECK | ||
| 820 | CheckPacketP((PKT *) RIO_PTR(HostP->Caddr, UnixRupP->RupP->txpkt)); | ||
| 821 | #endif | ||
| 822 | HostP->Copy((caddr_t) & CmdBlkP->Packet, RIO_PTR(HostP->Caddr, UnixRupP->RupP->txpkt), sizeof(PKT)); | 798 | HostP->Copy((caddr_t) & CmdBlkP->Packet, RIO_PTR(HostP->Caddr, UnixRupP->RupP->txpkt), sizeof(PKT)); | 
| 823 | 799 | ||
| 824 | /* | 800 | /* | 
| @@ -852,9 +828,6 @@ int RIOWFlushMark(int iPortP, struct CmdBlk *CmdBlkP) | |||
| 852 | unsigned long flags; | 828 | unsigned long flags; | 
| 853 | 829 | ||
| 854 | rio_spin_lock_irqsave(&PortP->portSem, flags); | 830 | rio_spin_lock_irqsave(&PortP->portSem, flags); | 
| 855 | #ifdef CHECK | ||
| 856 | CheckPortP(PortP); | ||
| 857 | #endif | ||
| 858 | PortP->WflushFlag++; | 831 | PortP->WflushFlag++; | 
| 859 | PortP->MagicFlags |= MAGIC_FLUSH; | 832 | PortP->MagicFlags |= MAGIC_FLUSH; | 
| 860 | rio_spin_unlock_irqrestore(&PortP->portSem, flags); | 833 | rio_spin_unlock_irqrestore(&PortP->portSem, flags); | 
| @@ -894,9 +867,6 @@ int RIOUnUse(int iPortP, struct CmdBlk *CmdBlkP) | |||
| 894 | 867 | ||
| 895 | rio_spin_lock_irqsave(&PortP->portSem, flags); | 868 | rio_spin_lock_irqsave(&PortP->portSem, flags); | 
| 896 | 869 | ||
| 897 | #ifdef CHECK | ||
| 898 | CheckPortP(PortP); | ||
| 899 | #endif | ||
| 900 | rio_dprintk(RIO_DEBUG_CMD, "Decrement in use count for port\n"); | 870 | rio_dprintk(RIO_DEBUG_CMD, "Decrement in use count for port\n"); | 
| 901 | 871 | ||
| 902 | if (PortP->InUse) { | 872 | if (PortP->InUse) { | 
