22 files changed, 1 insertions, 30 deletions

diff --git a/drivers/tty/amiserial.c b/drivers/tty/amiserial.c
index b84c83456dcc..b42f00d987ae 100644
--- a/drivers/tty/amiserial.c
+++ b/drivers/tty/amiserial.c
@@ -1974,7 +1974,6 @@ static int __init amiga_serial_probe(struct platform_device *pdev)
 
         /* Initialize the tty_driver structure */
 
-        serial_driver->owner = THIS_MODULE;
         serial_driver->driver_name = "amiserial";
         serial_driver->name = "ttyS";
         serial_driver->major = TTY_MAJOR;
diff --git a/drivers/tty/bfin_jtag_comm.c b/drivers/tty/bfin_jtag_comm.c
index 3a997760ec32..946f799861f5 100644
--- a/drivers/tty/bfin_jtag_comm.c
+++ b/drivers/tty/bfin_jtag_comm.c
@@ -257,7 +257,6 @@ static int __init bfin_jc_init(void)
         if (!bfin_jc_driver)
                 goto err_driver;
 
-        bfin_jc_driver->owner        = THIS_MODULE;
         bfin_jc_driver->driver_name  = DRV_NAME;
         bfin_jc_driver->name         = DEV_NAME;
         bfin_jc_driver->type         = TTY_DRIVER_TYPE_SERIAL;
diff --git a/drivers/tty/cyclades.c b/drivers/tty/cyclades.c
index 5575fee7a55e..bc7b5a5650ba 100644
--- a/drivers/tty/cyclades.c
+++ b/drivers/tty/cyclades.c
@@ -4090,7 +4090,6 @@ static int __init cy_init(void)
 
         /* Initialize the tty_driver structure */
 
-        cy_serial_driver->owner = THIS_MODULE;
         cy_serial_driver->driver_name = "cyclades";
         cy_serial_driver->name = "ttyC";
         cy_serial_driver->major = CYCLADES_MAJOR;
diff --git a/drivers/tty/ehv_bytechan.c b/drivers/tty/ehv_bytechan.c
index 1595dba0072c..4813684cb634 100644
--- a/drivers/tty/ehv_bytechan.c
+++ b/drivers/tty/ehv_bytechan.c
@@ -825,7 +825,6 @@ static int __init ehv_bc_init(void)
                 goto error;
         }
 
-        ehv_bc_driver->owner = THIS_MODULE;
         ehv_bc_driver->driver_name = "ehv-bc";
         ehv_bc_driver->name = ehv_bc_console.name;
         ehv_bc_driver->type = TTY_DRIVER_TYPE_CONSOLE;
diff --git a/drivers/tty/hvc/hvc_console.c b/drivers/tty/hvc/hvc_console.c
index b6b2d18fa38d..8880adf5fc6f 100644
--- a/drivers/tty/hvc/hvc_console.c
+++ b/drivers/tty/hvc/hvc_console.c
@@ -917,7 +917,6 @@ static int hvc_init(void)
                 goto out;
         }
 
-        drv->owner = THIS_MODULE;
         drv->driver_name = "hvc";
         drv->name = "hvc";
         drv->major = HVC_MAJOR;
diff --git a/drivers/tty/hvc/hvcs.c b/drivers/tty/hvc/hvcs.c
index df7e7a0a5e6c..da0aa476804d 100644
--- a/drivers/tty/hvc/hvcs.c
+++ b/drivers/tty/hvc/hvcs.c
@@ -1499,8 +1499,6 @@ static int __devinit hvcs_initialize(void)
                 goto index_fail;
         }
 
-        hvcs_tty_driver->owner = THIS_MODULE;
-
         hvcs_tty_driver->driver_name = hvcs_driver_name;
         hvcs_tty_driver->name = hvcs_device_node;
 
diff --git a/drivers/tty/hvc/hvsi.c b/drivers/tty/hvc/hvsi.c
index 1b5f28bd7930..60bc45164189 100644
--- a/drivers/tty/hvc/hvsi.c
+++ b/drivers/tty/hvc/hvsi.c
@@ -1088,7 +1088,6 @@ static int __init hvsi_init(void)
         if (!hvsi_driver)
                 return -ENOMEM;
 
-        hvsi_driver->owner = THIS_MODULE;
         hvsi_driver->driver_name = "hvsi";
         hvsi_driver->name = "hvsi";
         hvsi_driver->major = HVSI_MAJOR;
diff --git a/drivers/tty/ipwireless/tty.c b/drivers/tty/ipwireless/tty.c
index ef92869502a7..6990b3b649d3 100644
--- a/drivers/tty/ipwireless/tty.c
+++ b/drivers/tty/ipwireless/tty.c
@@ -614,7 +614,6 @@ int ipwireless_tty_init(void)
         if (!ipw_tty_driver)
                 return -ENOMEM;
 
-        ipw_tty_driver->owner = THIS_MODULE;
         ipw_tty_driver->driver_name = IPWIRELESS_PCCARD_NAME;
         ipw_tty_driver->name = "ttyIPWp";
         ipw_tty_driver->major = 0;
diff --git a/drivers/tty/isicom.c b/drivers/tty/isicom.c
index e5c295ab5dec..b3a28b5f02ad 100644
--- a/drivers/tty/isicom.c
+++ b/drivers/tty/isicom.c
@@ -1678,7 +1678,6 @@ static int __init isicom_init(void)
                 goto error;
         }
 
-        isicom_normal->owner                    = THIS_MODULE;
         isicom_normal->name                     = "ttyM";
         isicom_normal->major                    = ISICOM_NMAJOR;
         isicom_normal->minor_start              = 0;
diff --git a/drivers/tty/moxa.c b/drivers/tty/moxa.c
index d15a071b1a54..4a26323a926f 100644
--- a/drivers/tty/moxa.c
+++ b/drivers/tty/moxa.c
@@ -1036,7 +1036,6 @@ static int __init moxa_init(void)
         if (!moxaDriver)
                 return -ENOMEM;
 
-        moxaDriver->owner = THIS_MODULE;
         moxaDriver->name = "ttyMX";
         moxaDriver->major = ttymajor;
         moxaDriver->minor_start = 0;
diff --git a/drivers/tty/mxser.c b/drivers/tty/mxser.c
index 8998d527232a..260d03123524 100644
--- a/drivers/tty/mxser.c
+++ b/drivers/tty/mxser.c
@@ -2658,12 +2658,9 @@ static int __init mxser_module_init(void)
                 MXSER_VERSION);
 
         /* Initialize the tty_driver structure */
-        mxvar_sdriver->owner = THIS_MODULE;
-        mxvar_sdriver->magic = TTY_DRIVER_MAGIC;
         mxvar_sdriver->name = "ttyMI";
         mxvar_sdriver->major = ttymajor;
         mxvar_sdriver->minor_start = 0;
-        mxvar_sdriver->num = MXSER_PORTS + 1;
         mxvar_sdriver->type = TTY_DRIVER_TYPE_SERIAL;
         mxvar_sdriver->subtype = SERIAL_TYPE_NORMAL;
         mxvar_sdriver->init_termios = tty_std_termios;
diff --git a/drivers/tty/n_gsm.c b/drivers/tty/n_gsm.c
index fc7bbba585ce..c43b683b6eb8 100644
--- a/drivers/tty/n_gsm.c
+++ b/drivers/tty/n_gsm.c
@@ -3120,7 +3120,6 @@ static int __init gsm_init(void)
                 pr_err("gsm_init: tty allocation failed.\n");
                 return -EINVAL;
         }
-        gsm_tty_driver->owner   = THIS_MODULE;
         gsm_tty_driver->driver_name     = "gsmtty";
         gsm_tty_driver->name            = "gsmtty";
         gsm_tty_driver->major           = 0;    /* Dynamic */
diff --git a/drivers/tty/nozomi.c b/drivers/tty/nozomi.c
index 580da78b2d86..e7592f9037da 100644
--- a/drivers/tty/nozomi.c
+++ b/drivers/tty/nozomi.c
@@ -1916,7 +1916,6 @@ static __init int nozomi_init(void)
         if (!ntty_driver)
                 return -ENOMEM;
 
-        ntty_driver->owner = THIS_MODULE;
         ntty_driver->driver_name = NOZOMI_NAME_TTY;
         ntty_driver->name = "noz";
         ntty_driver->major = 0;
diff --git a/drivers/tty/pty.c b/drivers/tty/pty.c
index d505837b3478..f96ecaec24f8 100644
--- a/drivers/tty/pty.c
+++ b/drivers/tty/pty.c
@@ -393,7 +393,6 @@ static void __init legacy_pty_init(void)
         if (!pty_slave_driver)
                 panic("Couldn't allocate pty slave driver");
 
-        pty_driver->owner = THIS_MODULE;
         pty_driver->driver_name = "pty_master";
         pty_driver->name = "pty";
         pty_driver->major = PTY_MASTER_MAJOR;
@@ -411,7 +410,6 @@ static void __init legacy_pty_init(void)
         pty_driver->other = pty_slave_driver;
         tty_set_operations(pty_driver, &master_pty_ops_bsd);
 
-        pty_slave_driver->owner = THIS_MODULE;
         pty_slave_driver->driver_name = "pty_slave";
         pty_slave_driver->name = "ttyp";
         pty_slave_driver->major = PTY_SLAVE_MAJOR;
@@ -671,7 +669,6 @@ static void __init unix98_pty_init(void)
         if (!pts_driver)
                 panic("Couldn't allocate Unix98 pts driver");
 
-        ptm_driver->owner = THIS_MODULE;
         ptm_driver->driver_name = "pty_master";
         ptm_driver->name = "ptm";
         ptm_driver->major = UNIX98_PTY_MASTER_MAJOR;
@@ -690,7 +687,6 @@ static void __init unix98_pty_init(void)
         ptm_driver->other = pts_driver;
         tty_set_operations(ptm_driver, &ptm_unix98_ops);
 
-        pts_driver->owner = THIS_MODULE;
         pts_driver->driver_name = "pty_slave";
         pts_driver->name = "pts";
         pts_driver->major = UNIX98_PTY_SLAVE_MAJOR;
diff --git a/drivers/tty/rocket.c b/drivers/tty/rocket.c
index de88aa5566e5..b088e1ea4331 100644
--- a/drivers/tty/rocket.c
+++ b/drivers/tty/rocket.c
@@ -2277,7 +2277,6 @@ static int __init rp_init(void)
          * driver with the tty layer.
          */
 
-        rocket_driver->owner = THIS_MODULE;
         rocket_driver->flags = TTY_DRIVER_DYNAMIC_DEV;
         rocket_driver->name = "ttyR";
         rocket_driver->driver_name = "Comtrol RocketPort";
diff --git a/drivers/tty/serial/ifx6x60.c b/drivers/tty/serial/ifx6x60.c
index 7e925e20cbaa..144cd3987d4c 100644
--- a/drivers/tty/serial/ifx6x60.c
+++ b/drivers/tty/serial/ifx6x60.c
@@ -1375,12 +1375,9 @@ static int __init ifx_spi_init(void)
                 return -ENOMEM;
         }
 
-        tty_drv->magic = TTY_DRIVER_MAGIC;
-        tty_drv->owner = THIS_MODULE;
         tty_drv->driver_name = DRVNAME;
         tty_drv->name = TTYNAME;
         tty_drv->minor_start = IFX_SPI_TTY_ID;
-        tty_drv->num = 1;
         tty_drv->type = TTY_DRIVER_TYPE_SERIAL;
         tty_drv->subtype = SERIAL_TYPE_NORMAL;
         tty_drv->flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV;
diff --git a/drivers/tty/serial/msm_smd_tty.c b/drivers/tty/serial/msm_smd_tty.c
index 4f41dcdcb771..b25e6ee71443 100644
--- a/drivers/tty/serial/msm_smd_tty.c
+++ b/drivers/tty/serial/msm_smd_tty.c
@@ -203,7 +203,6 @@ static int __init smd_tty_init(void)
         if (smd_tty_driver == 0)
                 return -ENOMEM;
 
-        smd_tty_driver->owner = THIS_MODULE;
         smd_tty_driver->driver_name = "smd_tty_driver";
         smd_tty_driver->name = "smd";
         smd_tty_driver->major = 0;
diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c
index 13056180adf5..9c4c05b2825b 100644
--- a/drivers/tty/serial/serial_core.c
+++ b/drivers/tty/serial/serial_core.c
@@ -2230,7 +2230,6 @@ int uart_register_driver(struct uart_driver *drv)
 
         drv->tty_driver = normal;
 
-        normal->owner           = drv->owner;
         normal->driver_name     = drv->driver_name;
         normal->name            = drv->dev_name;
         normal->major           = drv->major;
diff --git a/drivers/tty/synclink.c b/drivers/tty/synclink.c
index ff8017f87914..2b2988c779c7 100644
--- a/drivers/tty/synclink.c
+++ b/drivers/tty/synclink.c
@@ -4333,7 +4333,6 @@ static int mgsl_init_tty(void)
         if (!serial_driver)
                 return -ENOMEM;
         
-        serial_driver->owner = THIS_MODULE;
         serial_driver->driver_name = "synclink";
         serial_driver->name = "ttySL";
         serial_driver->major = ttymajor;
diff --git a/drivers/tty/synclink_gt.c b/drivers/tty/synclink_gt.c
index 18b48cd3b41d..a8b66be37e6e 100644
--- a/drivers/tty/synclink_gt.c
+++ b/drivers/tty/synclink_gt.c
@@ -3795,7 +3795,6 @@ static int __init slgt_init(void)
 
         /* Initialize the tty_driver structure */
 
-        serial_driver->owner = THIS_MODULE;
         serial_driver->driver_name = tty_driver_name;
         serial_driver->name = tty_dev_prefix;
         serial_driver->major = ttymajor;
diff --git a/drivers/tty/synclinkmp.c b/drivers/tty/synclinkmp.c
index a7efe538df00..ddabb61c85ba 100644
--- a/drivers/tty/synclinkmp.c
+++ b/drivers/tty/synclinkmp.c
@@ -3977,7 +3977,6 @@ static int __init synclinkmp_init(void)
 
         /* Initialize the tty_driver structure */
 
-        serial_driver->owner = THIS_MODULE;
         serial_driver->driver_name = "synclinkmp";
         serial_driver->name = "ttySLM";
         serial_driver->major = ttymajor;
diff --git a/drivers/tty/vt/vt.c b/drivers/tty/vt/vt.c
index e5abceacc2d0..84c4a7d5603e 100644
--- a/drivers/tty/vt/vt.c
+++ b/drivers/tty/vt/vt.c
@@ -2994,7 +2994,7 @@ int __init vty_init(const struct file_operations *console_fops)
         console_driver = alloc_tty_driver(MAX_NR_CONSOLES);
         if (!console_driver)
                 panic("Couldn't allocate console driver\n");
-        console_driver->owner = THIS_MODULE;
+
         console_driver->name = "tty";
         console_driver->name_base = 1;
         console_driver->major = TTY_MAJOR;