Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

staging: dgnc: remove useless variables

The dgnc_major_serial_registered and dgnc_major_serial_registered
do not need to use to check whether the tty driver is registered or not.
These variables are used only in dgnc_cleanup_tty() function,
This function will be called normally with initialized board structure.
It means the dgnc_cleanup_tty() cannot be called with unregistered tty.

Signed-off-by: Daeseok Youn <daeseok.youn@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Daeseok Youn and committed by
Greg Kroah-Hartman
1cd7c062 33ccb442

+25 -42
-3
drivers/staging/dgnc/dgnc_driver.h
··· 203 203 struct tty_driver *print_driver; 204 204 char print_name[200]; 205 205 206 - bool dgnc_major_serial_registered; 207 - bool dgnc_major_transparent_print_registered; 208 - 209 206 u16 dpatype; /* The board "type", 210 207 * as defined by DPA 211 208 */
+25 -39
drivers/staging/dgnc/dgnc_tty.c
··· 204 204 */ 205 205 tty_set_operations(brd->serial_driver, &dgnc_tty_ops); 206 206 207 - if (!brd->dgnc_major_serial_registered) { 208 - /* Register tty devices */ 209 - rc = tty_register_driver(brd->serial_driver); 210 - if (rc < 0) { 211 - dev_dbg(&brd->pdev->dev, 212 - "Can't register tty device (%d)\n", rc); 213 - goto free_serial_driver; 214 - } 215 - brd->dgnc_major_serial_registered = true; 207 + rc = tty_register_driver(brd->serial_driver); 208 + if (rc < 0) { 209 + dev_dbg(&brd->pdev->dev, 210 + "Can't register tty device (%d)\n", rc); 211 + goto free_serial_driver; 216 212 } 217 213 218 214 /* ··· 243 247 */ 244 248 tty_set_operations(brd->print_driver, &dgnc_tty_ops); 245 249 246 - if (!brd->dgnc_major_transparent_print_registered) { 247 - /* Register Transparent Print devices */ 248 - rc = tty_register_driver(brd->print_driver); 249 - if (rc < 0) { 250 - dev_dbg(&brd->pdev->dev, 251 - "Can't register Transparent Print device(%d)\n", 252 - rc); 253 - goto free_print_driver; 254 - } 255 - brd->dgnc_major_transparent_print_registered = true; 250 + rc = tty_register_driver(brd->print_driver); 251 + if (rc < 0) { 252 + dev_dbg(&brd->pdev->dev, 253 + "Can't register Transparent Print device(%d)\n", 254 + rc); 255 + goto free_print_driver; 256 256 } 257 257 258 258 dgnc_BoardsByMajor[brd->serial_driver->major] = brd; ··· 388 396 { 389 397 int i = 0; 390 398 391 - if (brd->dgnc_major_serial_registered) { 392 - dgnc_BoardsByMajor[brd->serial_driver->major] = NULL; 393 - for (i = 0; i < brd->nasync; i++) { 394 - if (brd->channels[i]) 395 - dgnc_remove_tty_sysfs(brd->channels[i]-> 396 - ch_tun.un_sysfs); 397 - tty_unregister_device(brd->serial_driver, i); 398 - } 399 - tty_unregister_driver(brd->serial_driver); 400 - brd->dgnc_major_serial_registered = false; 399 + dgnc_BoardsByMajor[brd->serial_driver->major] = NULL; 400 + for (i = 0; i < brd->nasync; i++) { 401 + if (brd->channels[i]) 402 + dgnc_remove_tty_sysfs(brd->channels[i]-> 403 + ch_tun.un_sysfs); 404 + tty_unregister_device(brd->serial_driver, i); 401 405 } 406 + tty_unregister_driver(brd->serial_driver); 402 407 403 - if (brd->dgnc_major_transparent_print_registered) { 404 - dgnc_BoardsByMajor[brd->print_driver->major] = NULL; 405 - for (i = 0; i < brd->nasync; i++) { 406 - if (brd->channels[i]) 407 - dgnc_remove_tty_sysfs(brd->channels[i]-> 408 - ch_pun.un_sysfs); 409 - tty_unregister_device(brd->print_driver, i); 410 - } 411 - tty_unregister_driver(brd->print_driver); 412 - brd->dgnc_major_transparent_print_registered = false; 408 + dgnc_BoardsByMajor[brd->print_driver->major] = NULL; 409 + for (i = 0; i < brd->nasync; i++) { 410 + if (brd->channels[i]) 411 + dgnc_remove_tty_sysfs(brd->channels[i]-> 412 + ch_pun.un_sysfs); 413 + tty_unregister_device(brd->print_driver, i); 413 414 } 415 + tty_unregister_driver(brd->print_driver); 414 416 415 417 put_tty_driver(brd->serial_driver); 416 418 put_tty_driver(brd->print_driver);