[2.6 patch] drivers/char/rio/: kill rio_udelay

[Adrian Bunk <bunk@stusta.de>]

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

Signed-off-by: Adrian Bunk <bunk@stusta.de>

---

 drivers/char/rio/func.h      |    1 -
 drivers/char/rio/rio_linux.c |    5 -----
 drivers/char/rio/rioinit.c   |    7 ++++---
 3 files changed, 4 insertions(+), 9 deletions(-)

--- linux-2.6.12-rc6-mm1-full/drivers/char/rio/func.h.old	2005-06-14 02:45:06.000000000 +0200
+++ linux-2.6.12-rc6-mm1-full/drivers/char/rio/func.h	2005-06-14 02:45:12.000000000 +0200
@@ -147,7 +147,6 @@
 extern int    rio_pcicopy(char *src, char *dst, int n);
 extern int rio_minor (struct tty_struct *tty);
 extern int rio_ismodem (struct tty_struct *tty);
-extern void rio_udelay (int usecs);
 
 extern void rio_start_card_running (struct Host * HostP);
 
--- linux-2.6.12-rc6-mm1-full/drivers/char/rio/rio_linux.c.old	2005-06-14 02:45:19.000000000 +0200
+++ linux-2.6.12-rc6-mm1-full/drivers/char/rio/rio_linux.c	2005-06-14 02:45:27.000000000 +0200
@@ -354,11 +354,6 @@
 }
 
 
-void rio_udelay (int usecs)
-{
-  udelay (usecs);
-}
-
 static int rio_set_real_termios (void *ptr)
 {
   int rv, modem;
--- linux-2.6.12-rc6-mm1-full/drivers/char/rio/rioinit.c.old	2005-06-14 02:45:35.000000000 +0200
+++ linux-2.6.12-rc6-mm1-full/drivers/char/rio/rioinit.c	2005-06-14 02:55:17.000000000 +0200
@@ -37,6 +37,7 @@
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/errno.h>
+#include <linux/delay.h>
 #include <asm/io.h>
 #include <asm/system.h>
 #include <asm/string.h>
@@ -1560,14 +1561,14 @@
 					  INTERRUPT_DISABLE | BYTE_OPERATION |
 					  SLOW_LINKS | SLOW_AT_BUS);
 			WBYTE(DpRamP->DpResetTpu, 0xFF);
-			rio_udelay (3);
+			udelay(3);
 
 			rio_dprintk (RIO_DEBUG_INIT,  "RIOHostReset: Don't know if it worked. Try reset again\n");
 			WBYTE(DpRamP->DpControl,  BOOT_FROM_RAM | EXTERNAL_BUS_OFF |
 					  INTERRUPT_DISABLE | BYTE_OPERATION |
 					  SLOW_LINKS | SLOW_AT_BUS);
 			WBYTE(DpRamP->DpResetTpu, 0xFF);
-			rio_udelay (3);
+			udelay(3);
 			break;
 #ifdef FUTURE_RELEASE
 	case RIO_EISA:
@@ -1599,7 +1600,7 @@
 		DpRamP->DpControl  = RIO_PCI_BOOT_FROM_RAM;
 		DpRamP->DpResetInt = 0xFF;
 		DpRamP->DpResetTpu = 0xFF;
-		rio_udelay (100);
+		udelay(100);
 		/* for (i=0; i<6000; i++);  */
 		/* suspend( 3 ); */
 		break;

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/