Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 97998d8f authored by Adrian Bunk's avatar Adrian Bunk Committed by Linus Torvalds
Browse files

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



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

Signed-off-by: default avatarAdrian Bunk <bunk@stusta.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent d660a740

drivers/char/rio/func.h

+0 −1
Original line number Diff line number Diff line
@@ -147,7 +147,6 @@ struct rio_info * rio_info_store( int cmd, struct rio_info * p); 
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);

drivers/char/rio/rio_linux.c

+0 −5
Original line number Diff line number Diff line
@@ -354,11 +354,6 @@ int rio_ismodem(struct tty_struct *tty) 
}





void rio_udelay (int usecs)

{

  udelay (usecs);

}



static int rio_set_real_termios (void *ptr)

{

  int rv, modem;

drivers/char/rio/rioinit.c

+4 −3
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ static char *_rioinit_c_sccs_ = "@(#)rioinit.c 1.3"; 
#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 @@ uint Slot; 
					  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 @@ uint Slot; 
		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;