diff options
author | Jiri Slaby <jslaby@suse.cz> | 2012-03-05 08:51:52 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-03-08 14:37:58 -0500 |
commit | 2f16669d322e05171c9e1cfd94f402f7399bd2a3 (patch) | |
tree | 6a036cd0352928dd7056976a5f457c229322d67f /drivers/char | |
parent | 87cab16beb882d3f9e61a2c0184fa7cf76de1f90 (diff) |
TTY: remove re-assignments to tty_driver members
All num, magic and owner are set by alloc_tty_driver. No need to
re-set them on each allocation site.
pti driver sets something different to what it passes to
alloc_tty_driver. It is not a bug, since we don't use the lines
parameter in any way. Anyway this is fixed, and now we do the right
thing.
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Acked-by: Tilman Schmidt <tilman@imap.cc>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/char')
-rw-r--r-- | drivers/char/pcmcia/synclink_cs.c | 1 | ||||
-rw-r--r-- | drivers/char/ttyprintk.c | 2 |
2 files changed, 0 insertions, 3 deletions
diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c index 07f6a5abe372..c3bcb1221e6b 100644 --- a/drivers/char/pcmcia/synclink_cs.c +++ b/drivers/char/pcmcia/synclink_cs.c | |||
@@ -2836,7 +2836,6 @@ static int __init synclink_cs_init(void) | |||
2836 | 2836 | ||
2837 | /* Initialize the tty_driver structure */ | 2837 | /* Initialize the tty_driver structure */ |
2838 | 2838 | ||
2839 | serial_driver->owner = THIS_MODULE; | ||
2840 | serial_driver->driver_name = "synclink_cs"; | 2839 | serial_driver->driver_name = "synclink_cs"; |
2841 | serial_driver->name = "ttySLP"; | 2840 | serial_driver->name = "ttySLP"; |
2842 | serial_driver->major = ttymajor; | 2841 | serial_driver->major = ttymajor; |
diff --git a/drivers/char/ttyprintk.c b/drivers/char/ttyprintk.c index eedd5474850c..46b77ede84c0 100644 --- a/drivers/char/ttyprintk.c +++ b/drivers/char/ttyprintk.c | |||
@@ -184,12 +184,10 @@ static int __init ttyprintk_init(void) | |||
184 | if (!ttyprintk_driver) | 184 | if (!ttyprintk_driver) |
185 | return ret; | 185 | return ret; |
186 | 186 | ||
187 | ttyprintk_driver->owner = THIS_MODULE; | ||
188 | ttyprintk_driver->driver_name = "ttyprintk"; | 187 | ttyprintk_driver->driver_name = "ttyprintk"; |
189 | ttyprintk_driver->name = "ttyprintk"; | 188 | ttyprintk_driver->name = "ttyprintk"; |
190 | ttyprintk_driver->major = TTYAUX_MAJOR; | 189 | ttyprintk_driver->major = TTYAUX_MAJOR; |
191 | ttyprintk_driver->minor_start = 3; | 190 | ttyprintk_driver->minor_start = 3; |
192 | ttyprintk_driver->num = 1; | ||
193 | ttyprintk_driver->type = TTY_DRIVER_TYPE_CONSOLE; | 191 | ttyprintk_driver->type = TTY_DRIVER_TYPE_CONSOLE; |
194 | ttyprintk_driver->init_termios = tty_std_termios; | 192 | ttyprintk_driver->init_termios = tty_std_termios; |
195 | ttyprintk_driver->init_termios.c_oflag = OPOST | OCRNL | ONOCR | ONLRET; | 193 | ttyprintk_driver->init_termios.c_oflag = OPOST | OCRNL | ONOCR | ONLRET; |