diff options
| author | Daeseok Youn <daeseok.youn@gmail.com> | 2014-11-06 10:27:33 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-11-07 17:30:22 (GMT) |
| commit | 4c5dbca65bb0d2f5e940ca64d0876581f411d1a6 (patch) | |
| tree | a077d4707b0494f27e5e2c7ec949817696fab070 /drivers/staging/dgap | |
| parent | 429161d164491f430ddbc591f45dc2cd39e0e8a1 (diff) | |
| download | linux-4c5dbca65bb0d2f5e940ca64d0876581f411d1a6.tar.xz | |
staging: dgap: remove useless variables for saving tty's major
The board_t has a tty_struct(serial_driver and print_driver)
that has a major number. When major number is compared in
dgap_tty_open(), just use brd->serial_driver{print_driver}->major.
Signed-off-by: Daeseok Youn <daeseok.youn@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/dgap')
| -rw-r--r-- | drivers/staging/dgap/dgap.c | 9 | ||||
| -rw-r--r-- | drivers/staging/dgap/dgap.h | 3 |
2 files changed, 2 insertions, 10 deletions
diff --git a/drivers/staging/dgap/dgap.c b/drivers/staging/dgap/dgap.c index 688aaa4..3f23e5b 100644 --- a/drivers/staging/dgap/dgap.c +++ b/drivers/staging/dgap/dgap.c @@ -4477,10 +4477,10 @@ static int dgap_tty_open(struct tty_struct *tty, struct file *file) spin_lock_irqsave(&ch->ch_lock, lock_flags2); /* Figure out our type */ - if (major == brd->dgap_serial_major) { + if (major == brd->serial_driver->major) { un = &brd->channels[minor]->ch_tun; un->un_type = DGAP_SERIAL; - } else if (major == brd->dgap_transparent_print_major) { + } else if (major == brd->print_driver->major) { un = &brd->channels[minor]->ch_pun; un->un_type = DGAP_PRINT; } else { @@ -5302,10 +5302,7 @@ static int dgap_tty_register(struct board_t *brd) goto unregister_serial_drv; dgap_boards_by_major[brd->serial_driver->major] = brd; - brd->dgap_serial_major = brd->serial_driver->major; - dgap_boards_by_major[brd->print_driver->major] = brd; - brd->dgap_transparent_print_major = brd->print_driver->major; return 0; @@ -6563,7 +6560,6 @@ static void dgap_cleanup_tty(struct board_t *brd) unsigned int i; dgap_boards_by_major[brd->serial_driver->major] = NULL; - brd->dgap_serial_major = 0; for (i = 0; i < brd->nasync; i++) { tty_port_destroy(&brd->serial_ports[i]); dev = brd->channels[i]->ch_tun.un_sysfs; @@ -6575,7 +6571,6 @@ static void dgap_cleanup_tty(struct board_t *brd) kfree(brd->serial_ports); dgap_boards_by_major[brd->print_driver->major] = NULL; - brd->dgap_transparent_print_major = 0; for (i = 0; i < brd->nasync; i++) { tty_port_destroy(&brd->printer_ports[i]); dev = brd->channels[i]->ch_pun.un_sysfs; diff --git a/drivers/staging/dgap/dgap.h b/drivers/staging/dgap/dgap.h index 14e2ed0..6840331 100644 --- a/drivers/staging/dgap/dgap.h +++ b/drivers/staging/dgap/dgap.h @@ -584,9 +584,6 @@ struct board_t { struct tty_port *printer_ports; char print_name[200]; - u32 dgap_serial_major; - u32 dgap_transparent_print_major; - struct bs_t __iomem *bd_bs; /* Base structure pointer */ char *flipbuf; /* Our flip buffer, alloced if */ |