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

ipack: ipoctal: rename tty-driver pointer

The name "tty" is typically used for pointers to struct tty_struct.

Rename the tty-driver pointer used during registration to something more
apt to improve readability.

Acked-by: Samuel Iglesias Gonsalvez <siglesias@igalia.com>
Signed-off-by: Johan Hovold <johan@kernel.org>
Link: https://lore.kernel.org/r/20210917114622.5412-7-johan@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Johan Hovold and committed by
Greg Kroah-Hartman
349f2fe4 8bf7a12c

+22 -22
+22 -22
drivers/ipack/devices/ipoctal.c
··· 276 276 { 277 277 int res; 278 278 int i; 279 - struct tty_driver *tty; 279 + struct tty_driver *drv; 280 280 struct ipoctal_channel *channel; 281 281 struct ipack_region *region; 282 282 void __iomem *addr; ··· 359 359 /* Register the TTY device */ 360 360 361 361 /* Each IP-OCTAL channel is a TTY port */ 362 - tty = tty_alloc_driver(NR_CHANNELS, TTY_DRIVER_REAL_RAW | 362 + drv = tty_alloc_driver(NR_CHANNELS, TTY_DRIVER_REAL_RAW | 363 363 TTY_DRIVER_DYNAMIC_DEV); 364 - if (IS_ERR(tty)) 365 - return PTR_ERR(tty); 364 + if (IS_ERR(drv)) 365 + return PTR_ERR(drv); 366 366 367 367 /* Fill struct tty_driver with ipoctal data */ 368 - tty->owner = THIS_MODULE; 369 - tty->driver_name = KBUILD_MODNAME; 370 - tty->name = kasprintf(GFP_KERNEL, KBUILD_MODNAME ".%d.%d.", bus_nr, slot); 371 - if (!tty->name) { 368 + drv->owner = THIS_MODULE; 369 + drv->driver_name = KBUILD_MODNAME; 370 + drv->name = kasprintf(GFP_KERNEL, KBUILD_MODNAME ".%d.%d.", bus_nr, slot); 371 + if (!drv->name) { 372 372 res = -ENOMEM; 373 373 goto err_put_driver; 374 374 } 375 - tty->major = 0; 375 + drv->major = 0; 376 376 377 - tty->minor_start = 0; 378 - tty->type = TTY_DRIVER_TYPE_SERIAL; 379 - tty->subtype = SERIAL_TYPE_NORMAL; 380 - tty->init_termios = tty_std_termios; 381 - tty->init_termios.c_cflag = B9600 | CS8 | CREAD | HUPCL | CLOCAL; 382 - tty->init_termios.c_ispeed = 9600; 383 - tty->init_termios.c_ospeed = 9600; 377 + drv->minor_start = 0; 378 + drv->type = TTY_DRIVER_TYPE_SERIAL; 379 + drv->subtype = SERIAL_TYPE_NORMAL; 380 + drv->init_termios = tty_std_termios; 381 + drv->init_termios.c_cflag = B9600 | CS8 | CREAD | HUPCL | CLOCAL; 382 + drv->init_termios.c_ispeed = 9600; 383 + drv->init_termios.c_ospeed = 9600; 384 384 385 - tty_set_operations(tty, &ipoctal_fops); 386 - res = tty_register_driver(tty); 385 + tty_set_operations(drv, &ipoctal_fops); 386 + res = tty_register_driver(drv); 387 387 if (res) { 388 388 dev_err(&ipoctal->dev->dev, "Can't register tty driver.\n"); 389 389 goto err_free_name; 390 390 } 391 391 392 392 /* Save struct tty_driver for use it when uninstalling the device */ 393 - ipoctal->tty_drv = tty; 393 + ipoctal->tty_drv = drv; 394 394 395 395 for (i = 0; i < NR_CHANNELS; i++) { 396 396 struct device *tty_dev; ··· 407 407 spin_lock_init(&channel->lock); 408 408 channel->pointer_read = 0; 409 409 channel->pointer_write = 0; 410 - tty_dev = tty_port_register_device_attr(&channel->tty_port, tty, 410 + tty_dev = tty_port_register_device_attr(&channel->tty_port, drv, 411 411 i, NULL, channel, NULL); 412 412 if (IS_ERR(tty_dev)) { 413 413 dev_err(&ipoctal->dev->dev, "Failed to register tty device.\n"); ··· 429 429 return 0; 430 430 431 431 err_free_name: 432 - kfree(tty->name); 432 + kfree(drv->name); 433 433 err_put_driver: 434 - tty_driver_kref_put(tty); 434 + tty_driver_kref_put(drv); 435 435 436 436 return res; 437 437 }