[PATCH] drivers/char/rio/: kill rio_udelay

There's no need for a function that only calls udelay.

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

authored by Adrian Bunk and committed by Linus Torvalds 97998d8f d660a740

+4 -9
-1
drivers/char/rio/func.h
··· 147 extern int rio_pcicopy(char *src, char *dst, int n); 148 extern int rio_minor (struct tty_struct *tty); 149 extern int rio_ismodem (struct tty_struct *tty); 150 - extern void rio_udelay (int usecs); 151 152 extern void rio_start_card_running (struct Host * HostP); 153
··· 147 extern int rio_pcicopy(char *src, char *dst, int n); 148 extern int rio_minor (struct tty_struct *tty); 149 extern int rio_ismodem (struct tty_struct *tty); 150 151 extern void rio_start_card_running (struct Host * HostP); 152
-5
drivers/char/rio/rio_linux.c
··· 354 } 355 356 357 - void rio_udelay (int usecs) 358 - { 359 - udelay (usecs); 360 - } 361 - 362 static int rio_set_real_termios (void *ptr) 363 { 364 int rv, modem;
··· 354 } 355 356 357 static int rio_set_real_termios (void *ptr) 358 { 359 int rv, modem;
+4 -3
drivers/char/rio/rioinit.c
··· 37 #include <linux/module.h> 38 #include <linux/slab.h> 39 #include <linux/errno.h> 40 #include <asm/io.h> 41 #include <asm/system.h> 42 #include <asm/string.h> ··· 1561 INTERRUPT_DISABLE | BYTE_OPERATION | 1562 SLOW_LINKS | SLOW_AT_BUS); 1563 WBYTE(DpRamP->DpResetTpu, 0xFF); 1564 - rio_udelay (3); 1565 1566 rio_dprintk (RIO_DEBUG_INIT, "RIOHostReset: Don't know if it worked. Try reset again\n"); 1567 WBYTE(DpRamP->DpControl, BOOT_FROM_RAM | EXTERNAL_BUS_OFF | 1568 INTERRUPT_DISABLE | BYTE_OPERATION | 1569 SLOW_LINKS | SLOW_AT_BUS); 1570 WBYTE(DpRamP->DpResetTpu, 0xFF); 1571 - rio_udelay (3); 1572 break; 1573 #ifdef FUTURE_RELEASE 1574 case RIO_EISA: ··· 1600 DpRamP->DpControl = RIO_PCI_BOOT_FROM_RAM; 1601 DpRamP->DpResetInt = 0xFF; 1602 DpRamP->DpResetTpu = 0xFF; 1603 - rio_udelay (100); 1604 /* for (i=0; i<6000; i++); */ 1605 /* suspend( 3 ); */ 1606 break;
··· 37 #include <linux/module.h> 38 #include <linux/slab.h> 39 #include <linux/errno.h> 40 + #include <linux/delay.h> 41 #include <asm/io.h> 42 #include <asm/system.h> 43 #include <asm/string.h> ··· 1560 INTERRUPT_DISABLE | BYTE_OPERATION | 1561 SLOW_LINKS | SLOW_AT_BUS); 1562 WBYTE(DpRamP->DpResetTpu, 0xFF); 1563 + udelay(3); 1564 1565 rio_dprintk (RIO_DEBUG_INIT, "RIOHostReset: Don't know if it worked. Try reset again\n"); 1566 WBYTE(DpRamP->DpControl, BOOT_FROM_RAM | EXTERNAL_BUS_OFF | 1567 INTERRUPT_DISABLE | BYTE_OPERATION | 1568 SLOW_LINKS | SLOW_AT_BUS); 1569 WBYTE(DpRamP->DpResetTpu, 0xFF); 1570 + udelay(3); 1571 break; 1572 #ifdef FUTURE_RELEASE 1573 case RIO_EISA: ··· 1599 DpRamP->DpControl = RIO_PCI_BOOT_FROM_RAM; 1600 DpRamP->DpResetInt = 0xFF; 1601 DpRamP->DpResetTpu = 0xFF; 1602 + udelay(100); 1603 /* for (i=0; i<6000; i++); */ 1604 /* suspend( 3 ); */ 1605 break;