Commit 349f2fe4 authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman
Browse files

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: default avatarSamuel Iglesias Gonsalvez <siglesias@igalia.com>
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Link: https://lore.kernel.org/r/20210917114622.5412-7-johan@kernel.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8bf7a12c

drivers/ipack/devices/ipoctal.c

+24 −24
Original line number Diff line number Diff line
@@ -276,7 +276,7 @@ static int ipoctal_inst_slot(struct ipoctal *ipoctal, unsigned int bus_nr, 
{

	int res;

	int i;

	struct tty_driver *tty;

	struct tty_driver *drv;

	struct ipoctal_channel *channel;

	struct ipack_region *region;

	void __iomem *addr;
@@ -359,38 +359,38 @@ static int ipoctal_inst_slot(struct ipoctal *ipoctal, unsigned int bus_nr, 
	/* Register the TTY device */



	/* Each IP-OCTAL channel is a TTY port */

	tty = tty_alloc_driver(NR_CHANNELS, TTY_DRIVER_REAL_RAW |

	drv = tty_alloc_driver(NR_CHANNELS, TTY_DRIVER_REAL_RAW |

			TTY_DRIVER_DYNAMIC_DEV);

	if (IS_ERR(tty))

		return PTR_ERR(tty);

	if (IS_ERR(drv))

		return PTR_ERR(drv);



	/* Fill struct tty_driver with ipoctal data */

	tty->owner = THIS_MODULE;

	tty->driver_name = KBUILD_MODNAME;

	tty->name = kasprintf(GFP_KERNEL, KBUILD_MODNAME ".%d.%d.", bus_nr, slot);

	if (!tty->name) {

	drv->owner = THIS_MODULE;

	drv->driver_name = KBUILD_MODNAME;

	drv->name = kasprintf(GFP_KERNEL, KBUILD_MODNAME ".%d.%d.", bus_nr, slot);

	if (!drv->name) {

		res = -ENOMEM;

		goto err_put_driver;

	}

	tty->major = 0;

	drv->major = 0;



	tty->minor_start = 0;

	tty->type = TTY_DRIVER_TYPE_SERIAL;

	tty->subtype = SERIAL_TYPE_NORMAL;

	tty->init_termios = tty_std_termios;

	tty->init_termios.c_cflag = B9600 | CS8 | CREAD | HUPCL | CLOCAL;

	tty->init_termios.c_ispeed = 9600;

	tty->init_termios.c_ospeed = 9600;

	drv->minor_start = 0;

	drv->type = TTY_DRIVER_TYPE_SERIAL;

	drv->subtype = SERIAL_TYPE_NORMAL;

	drv->init_termios = tty_std_termios;

	drv->init_termios.c_cflag = B9600 | CS8 | CREAD | HUPCL | CLOCAL;

	drv->init_termios.c_ispeed = 9600;

	drv->init_termios.c_ospeed = 9600;



	tty_set_operations(tty, &ipoctal_fops);

	res = tty_register_driver(tty);

	tty_set_operations(drv, &ipoctal_fops);

	res = tty_register_driver(drv);

	if (res) {

		dev_err(&ipoctal->dev->dev, "Can't register tty driver.\n");

		goto err_free_name;

	}



	/* Save struct tty_driver for use it when uninstalling the device */

	ipoctal->tty_drv = tty;

	ipoctal->tty_drv = drv;



	for (i = 0; i < NR_CHANNELS; i++) {

		struct device *tty_dev;
@@ -407,7 +407,7 @@ static int ipoctal_inst_slot(struct ipoctal *ipoctal, unsigned int bus_nr, 
		spin_lock_init(&channel->lock);

		channel->pointer_read = 0;

		channel->pointer_write = 0;

		tty_dev = tty_port_register_device_attr(&channel->tty_port, tty,

		tty_dev = tty_port_register_device_attr(&channel->tty_port, drv,

							i, NULL, channel, NULL);

		if (IS_ERR(tty_dev)) {

			dev_err(&ipoctal->dev->dev, "Failed to register tty device.\n");
@@ -429,9 +429,9 @@ static int ipoctal_inst_slot(struct ipoctal *ipoctal, unsigned int bus_nr, 
	return 0;



err_free_name:

	kfree(tty->name);

	kfree(drv->name);

err_put_driver:

	tty_driver_kref_put(tty);

	tty_driver_kref_put(drv);



	return res;

}