From: Adrian Bunk <bunk@stusta.de>
To: Andrew Morton <akpm@osdl.org>
Cc: linux-kernel@vger.kernel.org, R.E.Wolff@BitWizard.nl
Subject: [2.6 patch] drivers/char/rio/: kill rio_udelay
Date: Tue, 21 Jun 2005 01:42:57 +0200 [thread overview]
Message-ID: <20050620234257.GE3666@stusta.de> (raw)
There's no need for a function that only calls udelay.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
---
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 <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;
next reply other threads:[~2005-06-21 0:16 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-06-20 23:42 Adrian Bunk [this message]
-- strict thread matches above, loose matches on Subject: below --
2005-06-14 1:45 [2.6 patch] drivers/char/rio/: kill rio_udelay Adrian Bunk
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20050620234257.GE3666@stusta.de \
--to=bunk@stusta.de \
--cc=R.E.Wolff@BitWizard.nl \
--cc=akpm@osdl.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox