[PATCH] riotty.c cleanups and warning fix

Fix a bunch of whitespace oddities and use `unsigned long' for a
jiffies-holding variable.

Signed-off-by: M.Baris Demiray <baris@labristeknoloji.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

authored by M.Baris Demiray and committed by Linus Torvalds d2a457cf 2b1ee233

+6 -9
+6 -9
drivers/char/rio/riotty.c
··· 524 register uint SysPort = dev; 525 struct ttystatics *tp; /* pointer to our ttystruct */ 526 #endif 527 - struct Port *PortP =ptr; /* pointer to the port structure */ 528 int deleted = 0; 529 int try = -1; /* Disable the timeouts by setting them to -1 */ 530 int repeat_this = -1; /* Congrats to those having 15 years of 531 uptime! (You get to break the driver.) */ 532 - long end_time; 533 struct tty_struct * tty; 534 unsigned long flags; 535 int Modem; 536 - int rv =0; 537 538 rio_dprintk (RIO_DEBUG_TTY, "port close SysPort %d\n",PortP->PortNum); 539 ··· 620 if (repeat_this -- <= 0) { 621 rv = -EINTR; 622 rio_dprintk (RIO_DEBUG_TTY, "Waiting for not idle closed broken by signal\n"); 623 - RIOPreemptiveCmd(p, PortP, FCLOSE ); 624 goto close_end; 625 } 626 rio_dprintk (RIO_DEBUG_TTY, "Calling timeout to flush in closing\n"); ··· 656 goto close_end; 657 } 658 659 - 660 - 661 /* Can't call RIOShortCommand with the port locked. */ 662 rio_spin_unlock_irqrestore(&PortP->portSem, flags); 663 664 if (RIOShortCommand(p, PortP, CLOSE, 1, 0) == RIO_FAIL) { 665 - RIOPreemptiveCmd(p, PortP,FCLOSE); 666 - goto close_end; 667 } 668 669 if (!deleted) ··· 695 ** RIO has it's own CTSFLOW and RTSFLOW flags in 'Config' in the port structure,** we need to make sure that the flags are clear when the port is opened. 696 */ 697 PortP->Config &= ~(RIO_CTSFLOW|RIO_RTSFLOW); 698 - 699 700 #ifdef STATS 701 PortP->Stat.CloseCnt++;
··· 524 register uint SysPort = dev; 525 struct ttystatics *tp; /* pointer to our ttystruct */ 526 #endif 527 + struct Port *PortP = ptr; /* pointer to the port structure */ 528 int deleted = 0; 529 int try = -1; /* Disable the timeouts by setting them to -1 */ 530 int repeat_this = -1; /* Congrats to those having 15 years of 531 uptime! (You get to break the driver.) */ 532 + unsigned long end_time; 533 struct tty_struct * tty; 534 unsigned long flags; 535 int Modem; 536 + int rv = 0; 537 538 rio_dprintk (RIO_DEBUG_TTY, "port close SysPort %d\n",PortP->PortNum); 539 ··· 620 if (repeat_this -- <= 0) { 621 rv = -EINTR; 622 rio_dprintk (RIO_DEBUG_TTY, "Waiting for not idle closed broken by signal\n"); 623 + RIOPreemptiveCmd(p, PortP, FCLOSE); 624 goto close_end; 625 } 626 rio_dprintk (RIO_DEBUG_TTY, "Calling timeout to flush in closing\n"); ··· 656 goto close_end; 657 } 658 659 /* Can't call RIOShortCommand with the port locked. */ 660 rio_spin_unlock_irqrestore(&PortP->portSem, flags); 661 662 if (RIOShortCommand(p, PortP, CLOSE, 1, 0) == RIO_FAIL) { 663 + RIOPreemptiveCmd(p, PortP, FCLOSE); 664 + goto close_end; 665 } 666 667 if (!deleted) ··· 697 ** RIO has it's own CTSFLOW and RTSFLOW flags in 'Config' in the port structure,** we need to make sure that the flags are clear when the port is opened. 698 */ 699 PortP->Config &= ~(RIO_CTSFLOW|RIO_RTSFLOW); 700 701 #ifdef STATS 702 PortP->Stat.CloseCnt++;