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/isdn/gigaset | |
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/isdn/gigaset')
-rw-r--r-- | drivers/isdn/gigaset/interface.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/isdn/gigaset/interface.c b/drivers/isdn/gigaset/interface.c index ee0a549a933a..648260b07f1a 100644 --- a/drivers/isdn/gigaset/interface.c +++ b/drivers/isdn/gigaset/interface.c | |||
@@ -669,17 +669,15 @@ EXPORT_SYMBOL_GPL(gigaset_if_receive); | |||
669 | void gigaset_if_initdriver(struct gigaset_driver *drv, const char *procname, | 669 | void gigaset_if_initdriver(struct gigaset_driver *drv, const char *procname, |
670 | const char *devname) | 670 | const char *devname) |
671 | { | 671 | { |
672 | unsigned minors = drv->minors; | ||
673 | int ret; | 672 | int ret; |
674 | struct tty_driver *tty; | 673 | struct tty_driver *tty; |
675 | 674 | ||
676 | drv->have_tty = 0; | 675 | drv->have_tty = 0; |
677 | 676 | ||
678 | drv->tty = tty = alloc_tty_driver(minors); | 677 | drv->tty = tty = alloc_tty_driver(drv->minors); |
679 | if (tty == NULL) | 678 | if (tty == NULL) |
680 | goto enomem; | 679 | goto enomem; |
681 | 680 | ||
682 | tty->magic = TTY_DRIVER_MAGIC, | ||
683 | tty->type = TTY_DRIVER_TYPE_SERIAL, | 681 | tty->type = TTY_DRIVER_TYPE_SERIAL, |
684 | tty->subtype = SERIAL_TYPE_NORMAL, | 682 | tty->subtype = SERIAL_TYPE_NORMAL, |
685 | tty->flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV; | 683 | tty->flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV; |
@@ -687,9 +685,6 @@ void gigaset_if_initdriver(struct gigaset_driver *drv, const char *procname, | |||
687 | tty->driver_name = procname; | 685 | tty->driver_name = procname; |
688 | tty->name = devname; | 686 | tty->name = devname; |
689 | tty->minor_start = drv->minor; | 687 | tty->minor_start = drv->minor; |
690 | tty->num = drv->minors; | ||
691 | |||
692 | tty->owner = THIS_MODULE; | ||
693 | 688 | ||
694 | tty->init_termios = tty_std_termios; | 689 | tty->init_termios = tty_std_termios; |
695 | tty->init_termios.c_cflag = B9600 | CS8 | CREAD | HUPCL | CLOCAL; | 690 | tty->init_termios.c_cflag = B9600 | CS8 | CREAD | HUPCL | CLOCAL; |