mirror of
https://github.com/torvalds/linux.git
synced 2024-12-01 00:21:32 +00:00
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>
This commit is contained in:
parent
429161d164
commit
4c5dbca65b
@ -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;
|
||||
|
@ -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 */
|
||||
|
Loading…
Reference in New Issue
Block a user