From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S261868AbVFUAQp (ORCPT ); Mon, 20 Jun 2005 20:16:45 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S261867AbVFUAPs (ORCPT ); Mon, 20 Jun 2005 20:15:48 -0400 Received: from emailhub.stusta.mhn.de ([141.84.69.5]:42254 "HELO mailout.stusta.mhn.de") by vger.kernel.org with SMTP id S261782AbVFTXnB (ORCPT ); Mon, 20 Jun 2005 19:43:01 -0400 Date: Tue, 21 Jun 2005 01:42:57 +0200 From: Adrian Bunk To: Andrew Morton Cc: linux-kernel@vger.kernel.org, R.E.Wolff@BitWizard.nl Subject: [2.6 patch] drivers/char/rio/: kill rio_udelay Message-ID: <20050620234257.GE3666@stusta.de> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.9i Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org There's no need for a function that only calls udelay. Signed-off-by: Adrian Bunk --- This patch was already sent on: - 14 Jun 2005 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 #include #include +#include #include #include #include @@ -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;