From: Patrick van de Lageweg <patrick@bitwizard.nl>
To: Linus Torvalds <torvalds@transmeta.com>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Alan Cox <alan@lxorguk.ukuu.org.uk>,
Rogier Wolff <wolff@bitwizard.nl>
Subject: [PATCH] generic_serial's block_til_ready
Date: Fri, 15 Dec 2000 12:59:29 +0100 (CET) [thread overview]
Message-ID: <Pine.LNX.4.21.0012151257170.505-100000@panoramix.bitwizard.nl> (raw)
Hi Linus,
This patch renames the block_til_ready of generic serial to
gs_block_til_ready.
it helps when other modules have a "static block_til_ready" defined when
used older modutils.
Patrick
diff -u -r linux-2.4.0-test13-pre1.clean/drivers/char/generic_serial.c linux-2.4.0-test13-pre1.block_til_ready/drivers/char/generic_serial.c
--- linux-2.4.0-test13-pre1.clean/drivers/char/generic_serial.c Thu Nov 16 21:51:27 2000
+++ linux-2.4.0-test13-pre1.block_til_ready/drivers/char/generic_serial.c Thu Dec 14 09:48:05 2000
@@ -35,7 +35,6 @@
static int gs_debug;
-
#ifdef DEBUG
#define gs_dprintk(f, str...) if (gs_debug & f) printk (str)
#else
@@ -583,7 +582,7 @@
}
-int block_til_ready(void *port_, struct file * filp)
+int gs_block_til_ready(void *port_, struct file * filp)
{
struct gs_port *port = port_;
DECLARE_WAITQUEUE(wait, current);
@@ -600,7 +599,7 @@
if (!tty) return 0;
- gs_dprintk (GS_DEBUG_BTR, "Entering block_till_ready.\n");
+ gs_dprintk (GS_DEBUG_BTR, "Entering gs_block_till_ready.\n");
/*
* If the device is in the middle of being closed, then block
* until it's done, and then try again.
@@ -1070,7 +1069,7 @@
EXPORT_SYMBOL(gs_start);
EXPORT_SYMBOL(gs_hangup);
EXPORT_SYMBOL(gs_do_softint);
-EXPORT_SYMBOL(block_til_ready);
+EXPORT_SYMBOL(gs_block_til_ready);
EXPORT_SYMBOL(gs_close);
EXPORT_SYMBOL(gs_set_termios);
EXPORT_SYMBOL(gs_init_port);
diff -u -r linux-2.4.0-test13-pre1.clean/drivers/char/sh-sci.c linux-2.4.0-test13-pre1.block_til_ready/drivers/char/sh-sci.c
--- linux-2.4.0-test13-pre1.clean/drivers/char/sh-sci.c Thu Oct 12 23:20:47 2000
+++ linux-2.4.0-test13-pre1.block_til_ready/drivers/char/sh-sci.c Thu Dec 14 09:48:05 2000
@@ -839,7 +839,7 @@
MOD_INC_USE_COUNT;
}
- retval = block_til_ready(port, filp);
+ retval = gs_block_til_ready(port, filp);
if (retval) {
MOD_DEC_USE_COUNT;
diff -u -r linux-2.4.0-test13-pre1.clean/drivers/char/sx.c linux-2.4.0-test13-pre1.block_til_ready/drivers/char/sx.c
--- linux-2.4.0-test13-pre1.clean/drivers/char/sx.c Thu Nov 16 21:51:27 2000
+++ linux-2.4.0-test13-pre1.block_til_ready/drivers/char/sx.c Thu Dec 14 09:48:05 2000
@@ -1478,7 +1478,7 @@
return -EIO;
}
- retval = block_til_ready(port, filp);
+ retval = gs_block_til_ready(port, filp);
sx_dprintk (SX_DEBUG_OPEN, "Block til ready returned %d. Count=%d\n",
retval, port->gs.count);
diff -u -r linux-2.4.0-test13-pre1.clean/drivers/char/vme_scc.c linux-2.4.0-test13-pre1.block_til_ready/drivers/char/vme_scc.c
--- linux-2.4.0-test13-pre1.clean/drivers/char/vme_scc.c Fri Dec 15 12:53:04 2000
+++ linux-2.4.0-test13-pre1.block_til_ready/drivers/char/vme_scc.c Fri Dec 15 12:53:34 2000
@@ -933,7 +933,7 @@
if (port->gs.count == 1) {
MOD_INC_USE_COUNT;
}
- retval = block_til_ready(port, filp);
+ retval = gs_block_til_ready(port, filp);
if (retval) {
MOD_DEC_USE_COUNT;
diff -u -r linux-2.4.0-test13-pre1.clean/include/linux/generic_serial.h linux-2.4.0-test13-pre1.block_til_ready/include/linux/generic_serial.h
--- linux-2.4.0-test13-pre1.clean/include/linux/generic_serial.h Mon Mar 13 04:18:55 2000
+++ linux-2.4.0-test13-pre1.block_til_ready/include/linux/generic_serial.h Thu Dec 14 09:48:05 2000
@@ -92,7 +92,7 @@
void gs_start(struct tty_struct *tty);
void gs_hangup(struct tty_struct *tty);
void gs_do_softint(void *private_);
-int block_til_ready(void *port, struct file *filp);
+int gs_block_til_ready(void *port, struct file *filp);
void gs_close(struct tty_struct *tty, struct file *filp);
void gs_set_termios (struct tty_struct * tty,
struct termios * old_termios);
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
Please read the FAQ at http://www.tux.org/lkml/
next reply other threads:[~2000-12-15 12:30 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2000-12-15 11:59 Patrick van de Lageweg [this message]
-- strict thread matches above, loose matches on Subject: below --
2000-12-12 15:43 [PATCH] generic_serial's block_til_ready Patrick van de Lageweg
2000-12-12 16:24 ` Nick Holloway
2000-12-12 16:27 ` Jeff Garzik
2000-12-06 8:44 Patrick van de Lageweg
2000-11-30 14:19 Patrick van de Lageweg
[not found] <Pine.LNX.4.21.0011060947190.2867-100000@panoramix.bitwizard.nl>
2000-11-21 12:00 ` Patrick van de Lageweg
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=Pine.LNX.4.21.0012151257170.505-100000@panoramix.bitwizard.nl \
--to=patrick@bitwizard.nl \
--cc=alan@lxorguk.ukuu.org.uk \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@transmeta.com \
--cc=wolff@bitwizard.nl \
/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;
as well as URLs for NNTP newsgroup(s).