Re: [PATCH] TTY changes for 2.5.69

From: Greg KH (greg@kroah.com)
Date: Wed May 07 2003 - 18:16:26 EST


ChangeSet 1.1093, 2003/05/07 14:58:42-07:00, hannal@us.ibm.com

[PATCH] serial_tx3912 tty_driver add .owner field remove MOD_INC/DEC_USE_COUNT

 drivers/char/serial_tx3912.c | 35 +----------------------------------
 1 files changed, 1 insertion(+), 34 deletions(-)

diff -Nru a/drivers/char/serial_tx3912.c b/drivers/char/serial_tx3912.c
--- a/drivers/char/serial_tx3912.c Wed May 7 16:01:40 2003
+++ b/drivers/char/serial_tx3912.c Wed May 7 16:01:40 2003
@@ -41,8 +41,6 @@
 static void rs_shutdown_port (void * ptr);
 static int rs_set_real_termios (void *ptr);
 static int rs_chars_in_buffer (void * ptr);
-static void rs_hungup (void *ptr);
-static void rs_close (void *ptr);
 
 /*
  * Used by generic serial driver to access hardware
@@ -56,8 +54,6 @@
         .shutdown_port = rs_shutdown_port,
         .set_real_termios = rs_set_real_termios,
         .chars_in_buffer = rs_chars_in_buffer,
- .close = rs_close,
- .hungup = rs_hungup,
 };
 
 /*
@@ -579,9 +575,6 @@
 
         rs_dprintk (TX3912_UART_DEBUG_OPEN, "before inc_use_count (count=%d.\n",
                     port->gs.count);
- if (port->gs.count == 1) {
- MOD_INC_USE_COUNT;
- }
         rs_dprintk (TX3912_UART_DEBUG_OPEN, "after inc_use_count\n");
 
         /* Jim: Initialize port hardware here */
@@ -595,7 +588,6 @@
                     retval, port->gs.count);
 
         if (retval) {
- MOD_DEC_USE_COUNT;
                 port->gs.count--;
                 return retval;
         }
@@ -621,32 +613,6 @@
 }
 
 
-
-static void rs_close (void *ptr)
-{
- func_enter ();
-
- /* Anything to do here? */
-
- MOD_DEC_USE_COUNT;
- func_exit ();
-}
-
-
-/* I haven't the foggiest why the decrement use count has to happen
- here. The whole linux serial drivers stuff needs to be redesigned.
- My guess is that this is a hack to minimize the impact of a bug
- elsewhere. Thinking about it some more. (try it sometime) Try
- running minicom on a serial port that is driven by a modularized
- driver. Have the modem hangup. Then remove the driver module. Then
- exit minicom. I expect an "oops". -- REW */
-static void rs_hungup (void *ptr)
-{
- func_enter ();
- MOD_DEC_USE_COUNT;
- func_exit ();
-}
-
 static int rs_ioctl (struct tty_struct * tty, struct file * filp,
                      unsigned int cmd, unsigned long arg)
 {
@@ -839,6 +805,7 @@
 
         memset(&rs_driver, 0, sizeof(rs_driver));
         rs_driver.magic = TTY_DRIVER_MAGIC;
+ rs_driver.owner = THIS_MODULE;
         rs_driver.driver_name = "serial";
         rs_driver.name = "ttyS";
         rs_driver.major = TTY_MAJOR;

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/



This archive was generated by hypermail 2b29 : Wed May 07 2003 - 22:00:33 EST