Commit 2f16669d authored by Jiri Slaby's avatar Jiri Slaby Committed by Greg Kroah-Hartman
Browse files

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: default avatarJiri Slaby <jslaby@suse.cz>
Acked-by: default avatarTilman Schmidt <tilman@imap.cc>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 87cab16b

arch/ia64/hp/sim/simserial.c

+0 −1
Original line number Diff line number Diff line
@@ -928,7 +928,6 @@ simrs_init (void) 


	/* Initialize the tty_driver structure */



	hp_simserial_driver->owner = THIS_MODULE;

	hp_simserial_driver->driver_name = "simserial";

	hp_simserial_driver->name = "ttyS";

	hp_simserial_driver->major = TTY_MAJOR;

arch/m68k/emu/nfcon.c

+0 −1
Original line number Diff line number Diff line
@@ -127,7 +127,6 @@ static int __init nfcon_init(void) 
	if (!nfcon_tty_driver)

		return -ENOMEM;



	nfcon_tty_driver->owner = THIS_MODULE;

	nfcon_tty_driver->driver_name = "nfcon";

	nfcon_tty_driver->name = "nfcon";

	nfcon_tty_driver->type = TTY_DRIVER_TYPE_SYSTEM;

arch/xtensa/platforms/iss/console.c

+0 −1
Original line number Diff line number Diff line
@@ -216,7 +216,6 @@ int __init rs_init(void) 


	/* Initialize the tty_driver structure */



	serial_driver->owner = THIS_MODULE;

	serial_driver->driver_name = "iss_serial";

	serial_driver->name = "ttyS";

	serial_driver->major = TTY_MAJOR;

drivers/char/pcmcia/synclink_cs.c

+0 −1
Original line number Diff line number Diff line
@@ -2836,7 +2836,6 @@ static int __init synclink_cs_init(void) 


    /* Initialize the tty_driver structure */



    serial_driver->owner = THIS_MODULE;

    serial_driver->driver_name = "synclink_cs";

    serial_driver->name = "ttySLP";

    serial_driver->major = ttymajor;

drivers/char/ttyprintk.c

+0 −2
Original line number Diff line number Diff line
@@ -184,12 +184,10 @@ static int __init ttyprintk_init(void) 
	if (!ttyprintk_driver)

		return ret;



	ttyprintk_driver->owner = THIS_MODULE;

	ttyprintk_driver->driver_name = "ttyprintk";

	ttyprintk_driver->name = "ttyprintk";

	ttyprintk_driver->major = TTYAUX_MAJOR;

	ttyprintk_driver->minor_start = 3;

	ttyprintk_driver->num = 1;

	ttyprintk_driver->type = TTY_DRIVER_TYPE_CONSOLE;

	ttyprintk_driver->init_termios = tty_std_termios;

	ttyprintk_driver->init_termios.c_oflag = OPOST | OCRNL | ONOCR | ONLRET;

CRA Git | Maintained and supported by SUSTech CRA and CCSE