public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] generic_serial's block_til_ready
@ 2000-12-12 15:43 Patrick van de Lageweg
  2000-12-12 16:24 ` Nick Holloway
  0 siblings, 1 reply; 7+ messages in thread
From: Patrick van de Lageweg @ 2000-12-12 15:43 UTC (permalink / raw)
  To: Linus Torvalds; +Cc: Rogier Wolff, Alan Cox, Linux Kernel Mailing List

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 -r -u linux-2.4.0-test10.clean/drivers/char/generic_serial.c linux-2.4.0-test10.generic_serial/drivers/char/generic_serial.c
--- linux-2.4.0-test10.clean/drivers/char/generic_serial.c	Tue Nov 21 12:08:20 2000
+++ linux-2.4.0-test10.generic_serial/drivers/char/generic_serial.c	Tue Nov 21 12:31:43 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 -r -u linux-2.4.0-test10.clean/drivers/char/sh-sci.c linux-2.4.0-test10.generic_serial/drivers/char/sh-sci.c
--- linux-2.4.0-test10.clean/drivers/char/sh-sci.c	Wed Nov  1 13:57:19 2000
+++ linux-2.4.0-test10.generic_serial/drivers/char/sh-sci.c	Tue Nov 21 12:13:56 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 -r -u linux-2.4.0-test10.clean/drivers/char/sx.c linux-2.4.0-test10.generic_serial/drivers/char/sx.c
--- linux-2.4.0-test10.clean/drivers/char/sx.c	Tue Nov 21 12:08:21 2000
+++ linux-2.4.0-test10.generic_serial/drivers/char/sx.c	Tue Nov 21 12:13:56 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 -r -u linux-2.4.0-test10.clean/include/linux/generic_serial.h linux-2.4.0-test10.generic_serial/include/linux/generic_serial.h
--- linux-2.4.0-test10.clean/include/linux/generic_serial.h	Mon Mar 13 04:18:55 2000
+++ linux-2.4.0-test10.generic_serial/include/linux/generic_serial.h	Tue Nov 21 12:13:56 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/

^ permalink raw reply	[flat|nested] 7+ messages in thread
* [PATCH] generic_serial's block_til_ready
@ 2000-12-15 11:59 Patrick van de Lageweg
  0 siblings, 0 replies; 7+ messages in thread
From: Patrick van de Lageweg @ 2000-12-15 11:59 UTC (permalink / raw)
  To: Linus Torvalds; +Cc: Linux Kernel Mailing List, Alan Cox, Rogier Wolff

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/

^ permalink raw reply	[flat|nested] 7+ messages in thread
* [PATCH] generic_serial's block_til_ready
@ 2000-12-06  8:44 Patrick van de Lageweg
  0 siblings, 0 replies; 7+ messages in thread
From: Patrick van de Lageweg @ 2000-12-06  8:44 UTC (permalink / raw)
  To: Linus Torvalds; +Cc: Linux Kernel Mailing List, Alan Cox, Rogier Wolff

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 -r -u linux-2.4.0-test10.clean/drivers/char/generic_serial.c linux-2.4.0-test10.generic_serial/drivers/char/generic_serial.c
--- linux-2.4.0-test10.clean/drivers/char/generic_serial.c	Tue Nov 21 12:08:20 2000
+++ linux-2.4.0-test10.generic_serial/drivers/char/generic_serial.c	Tue Nov 21 12:31:43 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 -r -u linux-2.4.0-test10.clean/drivers/char/sh-sci.c linux-2.4.0-test10.generic_serial/drivers/char/sh-sci.c
--- linux-2.4.0-test10.clean/drivers/char/sh-sci.c	Wed Nov  1 13:57:19 2000
+++ linux-2.4.0-test10.generic_serial/drivers/char/sh-sci.c	Tue Nov 21 12:13:56 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 -r -u linux-2.4.0-test10.clean/drivers/char/sx.c linux-2.4.0-test10.generic_serial/drivers/char/sx.c
--- linux-2.4.0-test10.clean/drivers/char/sx.c	Tue Nov 21 12:08:21 2000
+++ linux-2.4.0-test10.generic_serial/drivers/char/sx.c	Tue Nov 21 12:13:56 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 -r -u linux-2.4.0-test10.clean/include/linux/generic_serial.h linux-2.4.0-test10.generic_serial/include/linux/generic_serial.h
--- linux-2.4.0-test10.clean/include/linux/generic_serial.h	Mon Mar 13 04:18:55 2000
+++ linux-2.4.0-test10.generic_serial/include/linux/generic_serial.h	Tue Nov 21 12:13:56 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/

^ permalink raw reply	[flat|nested] 7+ messages in thread
* [PATCH] generic_serial's block_til_ready
@ 2000-11-30 14:19 Patrick van de Lageweg
  0 siblings, 0 replies; 7+ messages in thread
From: Patrick van de Lageweg @ 2000-11-30 14:19 UTC (permalink / raw)
  To: Linus Torvalds; +Cc: Linux Kernel Mailing List, Rogier Wolff

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 -r -u linux-2.4.0-test10.clean/drivers/char/generic_serial.c linux-2.4.0-test10.generic_serial/drivers/char/generic_serial.c
--- linux-2.4.0-test10.clean/drivers/char/generic_serial.c	Tue Nov 21 12:08:20 2000
+++ linux-2.4.0-test10.generic_serial/drivers/char/generic_serial.c	Tue Nov 21 12:31:43 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 -r -u linux-2.4.0-test10.clean/drivers/char/sh-sci.c linux-2.4.0-test10.generic_serial/drivers/char/sh-sci.c
--- linux-2.4.0-test10.clean/drivers/char/sh-sci.c	Wed Nov  1 13:57:19 2000
+++ linux-2.4.0-test10.generic_serial/drivers/char/sh-sci.c	Tue Nov 21 12:13:56 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 -r -u linux-2.4.0-test10.clean/drivers/char/sx.c linux-2.4.0-test10.generic_serial/drivers/char/sx.c
--- linux-2.4.0-test10.clean/drivers/char/sx.c	Tue Nov 21 12:08:21 2000
+++ linux-2.4.0-test10.generic_serial/drivers/char/sx.c	Tue Nov 21 12:13:56 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 -r -u linux-2.4.0-test10.clean/include/linux/generic_serial.h linux-2.4.0-test10.generic_serial/include/linux/generic_serial.h
--- linux-2.4.0-test10.clean/include/linux/generic_serial.h	Mon Mar 13 04:18:55 2000
+++ linux-2.4.0-test10.generic_serial/include/linux/generic_serial.h	Tue Nov 21 12:13:56 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/

^ permalink raw reply	[flat|nested] 7+ messages in thread
[parent not found: <Pine.LNX.4.21.0011060947190.2867-100000@panoramix.bitwizard.nl>]

end of thread, other threads:[~2000-12-15 12:30 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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
  -- strict thread matches above, loose matches on Subject: below --
2000-12-15 11:59 Patrick van de Lageweg
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

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox