You've already forked linux-rockchip
mirror of
https://github.com/armbian/linux-rockchip.git
synced 2026-01-06 11:08:10 -08:00
tty: drop put_tty_driver
put_tty_driver() is an alias for tty_driver_kref_put(). There is no need for two exported identical functions, therefore switch all users of old put_tty_driver() to new tty_driver_kref_put() and remove the former for good. Cc: Richard Henderson <rth@twiddle.net> Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru> Cc: Matt Turner <mattst88@gmail.com> Cc: Geert Uytterhoeven <geert@linux-m68k.org> Cc: Jeff Dike <jdike@addtoit.com> Cc: Richard Weinberger <richard@nod.at> Cc: Anton Ivanov <anton.ivanov@cambridgegreys.com> Cc: Chris Zankel <chris@zankel.net> Cc: Max Filippov <jcmvbkbc@gmail.com> Cc: Arnd Bergmann <arnd@arndb.de> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Samuel Iglesias Gonsalvez <siglesias@igalia.com> Cc: Jens Taprogge <jens.taprogge@taprogge.org> Cc: Karsten Keil <isdn@linux-pingi.de> Cc: Scott Branden <scott.branden@broadcom.com> Cc: Ulf Hansson <ulf.hansson@linaro.org> Cc: "David S. Miller" <davem@davemloft.net> Cc: Jakub Kicinski <kuba@kernel.org> Cc: Heiko Carstens <hca@linux.ibm.com> Cc: Vasily Gorbik <gor@linux.ibm.com> Cc: Christian Borntraeger <borntraeger@de.ibm.com> Cc: David Lin <dtwlin@gmail.com> Cc: Johan Hovold <johan@kernel.org> Cc: Alex Elder <elder@kernel.org> Cc: Jiri Slaby <jirislaby@kernel.org> Cc: Laurentiu Tudor <laurentiu.tudor@nxp.com> Cc: Jiri Kosina <jikos@kernel.org> Cc: David Sterba <dsterba@suse.com> Cc: Shawn Guo <shawnguo@kernel.org> Cc: Sascha Hauer <s.hauer@pengutronix.de> Cc: Pengutronix Kernel Team <kernel@pengutronix.de> Cc: Fabio Estevam <festevam@gmail.com> Cc: NXP Linux Team <linux-imx@nxp.com> Cc: Oliver Neukum <oneukum@suse.com> Cc: Felipe Balbi <balbi@kernel.org> Cc: Mathias Nyman <mathias.nyman@intel.com> Cc: Marcel Holtmann <marcel@holtmann.org> Cc: Johan Hedberg <johan.hedberg@gmail.com> Cc: Luiz Augusto von Dentz <luiz.dentz@gmail.com> Acked-by: Alex Elder <elder@linaro.org> Acked-by: Christian Borntraeger <borntraeger@de.ibm.com> Acked-by: Max Filippov <jcmvbkbc@gmail.com> Acked-by: David Sterba <dsterba@suse.com> Acked-by: Samuel Iglesias Gonsálvez <siglesias@igalia.com> Signed-off-by: Jiri Slaby <jslaby@suse.cz> Link: https://lore.kernel.org/r/20210723074317.32690-8-jslaby@suse.cz Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
cb9ea618ee
commit
9f90a4ddef
@@ -221,7 +221,7 @@ srmcons_init(void)
|
||||
tty_port_link_device(&srmcons_singleton.port, driver, 0);
|
||||
err = tty_register_driver(driver);
|
||||
if (err) {
|
||||
put_tty_driver(driver);
|
||||
tty_driver_kref_put(driver);
|
||||
tty_port_destroy(&srmcons_singleton.port);
|
||||
return err;
|
||||
}
|
||||
|
||||
@@ -144,7 +144,7 @@ static int __init nfcon_init(void)
|
||||
res = tty_register_driver(driver);
|
||||
if (res) {
|
||||
pr_err("failed to register nfcon tty driver\n");
|
||||
put_tty_driver(driver);
|
||||
tty_driver_kref_put(driver);
|
||||
tty_port_destroy(&nfcon_tty_port);
|
||||
return res;
|
||||
}
|
||||
@@ -161,7 +161,7 @@ static void __exit nfcon_exit(void)
|
||||
{
|
||||
unregister_console(&nf_console);
|
||||
tty_unregister_driver(nfcon_tty_driver);
|
||||
put_tty_driver(nfcon_tty_driver);
|
||||
tty_driver_kref_put(nfcon_tty_driver);
|
||||
tty_port_destroy(&nfcon_tty_port);
|
||||
}
|
||||
|
||||
|
||||
@@ -568,7 +568,7 @@ int register_lines(struct line_driver *line_driver,
|
||||
if (err) {
|
||||
printk(KERN_ERR "register_lines : can't register %s driver\n",
|
||||
line_driver->name);
|
||||
put_tty_driver(driver);
|
||||
tty_driver_kref_put(driver);
|
||||
for (i = 0; i < nlines; i++)
|
||||
tty_port_destroy(&lines[i].port);
|
||||
return err;
|
||||
|
||||
@@ -178,7 +178,7 @@ static int __init rs_init(void)
|
||||
static __exit void rs_exit(void)
|
||||
{
|
||||
tty_unregister_driver(serial_driver);
|
||||
put_tty_driver(serial_driver);
|
||||
tty_driver_kref_put(serial_driver);
|
||||
tty_port_destroy(&serial_port);
|
||||
}
|
||||
|
||||
|
||||
@@ -2841,7 +2841,7 @@ static int __init synclink_cs_init(void)
|
||||
err_unreg_tty:
|
||||
tty_unregister_driver(serial_driver);
|
||||
err_put_tty:
|
||||
put_tty_driver(serial_driver);
|
||||
tty_driver_kref_put(serial_driver);
|
||||
err:
|
||||
return rc;
|
||||
}
|
||||
@@ -2850,7 +2850,7 @@ static void __exit synclink_cs_exit(void)
|
||||
{
|
||||
pcmcia_unregister_driver(&mgslpc_driver);
|
||||
tty_unregister_driver(serial_driver);
|
||||
put_tty_driver(serial_driver);
|
||||
tty_driver_kref_put(serial_driver);
|
||||
}
|
||||
|
||||
module_init(synclink_cs_init);
|
||||
|
||||
@@ -198,7 +198,7 @@ static int __init ttyprintk_init(void)
|
||||
return 0;
|
||||
|
||||
error:
|
||||
put_tty_driver(ttyprintk_driver);
|
||||
tty_driver_kref_put(ttyprintk_driver);
|
||||
tty_port_destroy(&tpk_port.port);
|
||||
return ret;
|
||||
}
|
||||
@@ -206,7 +206,7 @@ error:
|
||||
static void __exit ttyprintk_exit(void)
|
||||
{
|
||||
tty_unregister_driver(ttyprintk_driver);
|
||||
put_tty_driver(ttyprintk_driver);
|
||||
tty_driver_kref_put(ttyprintk_driver);
|
||||
tty_port_destroy(&tpk_port.port);
|
||||
}
|
||||
|
||||
|
||||
@@ -371,7 +371,7 @@ static int ipoctal_inst_slot(struct ipoctal *ipoctal, unsigned int bus_nr,
|
||||
res = tty_register_driver(tty);
|
||||
if (res) {
|
||||
dev_err(&ipoctal->dev->dev, "Can't register tty driver.\n");
|
||||
put_tty_driver(tty);
|
||||
tty_driver_kref_put(tty);
|
||||
return res;
|
||||
}
|
||||
|
||||
@@ -696,7 +696,7 @@ static void __ipoctal_remove(struct ipoctal *ipoctal)
|
||||
}
|
||||
|
||||
tty_unregister_driver(ipoctal->tty_drv);
|
||||
put_tty_driver(ipoctal->tty_drv);
|
||||
tty_driver_kref_put(ipoctal->tty_drv);
|
||||
kfree(ipoctal);
|
||||
}
|
||||
|
||||
|
||||
@@ -1290,7 +1290,7 @@ static int __init capinc_tty_init(void)
|
||||
|
||||
err = tty_register_driver(drv);
|
||||
if (err) {
|
||||
put_tty_driver(drv);
|
||||
tty_driver_kref_put(drv);
|
||||
kfree(capiminors);
|
||||
printk(KERN_ERR "Couldn't register capi_nc driver\n");
|
||||
return err;
|
||||
@@ -1302,7 +1302,7 @@ static int __init capinc_tty_init(void)
|
||||
static void __exit capinc_tty_exit(void)
|
||||
{
|
||||
tty_unregister_driver(capinc_tty_driver);
|
||||
put_tty_driver(capinc_tty_driver);
|
||||
tty_driver_kref_put(capinc_tty_driver);
|
||||
kfree(capiminors);
|
||||
}
|
||||
|
||||
|
||||
@@ -249,7 +249,7 @@ int bcm_vk_tty_init(struct bcm_vk *vk, char *name)
|
||||
tty_drv->name = kstrdup(name, GFP_KERNEL);
|
||||
if (!tty_drv->name) {
|
||||
err = -ENOMEM;
|
||||
goto err_put_tty_driver;
|
||||
goto err_tty_driver_kref_put;
|
||||
}
|
||||
tty_drv->type = TTY_DRIVER_TYPE_SERIAL;
|
||||
tty_drv->subtype = SERIAL_TYPE_NORMAL;
|
||||
@@ -295,8 +295,8 @@ err_kfree_tty_name:
|
||||
kfree(tty_drv->name);
|
||||
tty_drv->name = NULL;
|
||||
|
||||
err_put_tty_driver:
|
||||
put_tty_driver(tty_drv);
|
||||
err_tty_driver_kref_put:
|
||||
tty_driver_kref_put(tty_drv);
|
||||
|
||||
return err;
|
||||
}
|
||||
@@ -317,7 +317,7 @@ void bcm_vk_tty_exit(struct bcm_vk *vk)
|
||||
kfree(vk->tty_drv->name);
|
||||
vk->tty_drv->name = NULL;
|
||||
|
||||
put_tty_driver(vk->tty_drv);
|
||||
tty_driver_kref_put(vk->tty_drv);
|
||||
}
|
||||
|
||||
void bcm_vk_tty_terminate_tty_user(struct bcm_vk *vk)
|
||||
|
||||
@@ -1165,7 +1165,7 @@ static int __init sdio_uart_init(void)
|
||||
err2:
|
||||
tty_unregister_driver(tty_drv);
|
||||
err1:
|
||||
put_tty_driver(tty_drv);
|
||||
tty_driver_kref_put(tty_drv);
|
||||
return ret;
|
||||
}
|
||||
|
||||
@@ -1173,7 +1173,7 @@ static void __exit sdio_uart_exit(void)
|
||||
{
|
||||
sdio_unregister_driver(&sdio_uart_driver);
|
||||
tty_unregister_driver(sdio_uart_tty_driver);
|
||||
put_tty_driver(sdio_uart_tty_driver);
|
||||
tty_driver_kref_put(sdio_uart_tty_driver);
|
||||
}
|
||||
|
||||
module_init(sdio_uart_init);
|
||||
|
||||
@@ -3269,7 +3269,7 @@ static int __init hso_init(void)
|
||||
err_unreg_tty:
|
||||
tty_unregister_driver(tty_drv);
|
||||
err_free_tty:
|
||||
put_tty_driver(tty_drv);
|
||||
tty_driver_kref_put(tty_drv);
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -3280,7 +3280,7 @@ static void __exit hso_exit(void)
|
||||
tty_unregister_driver(tty_drv);
|
||||
/* deregister the usb driver */
|
||||
usb_deregister(&hso_driver);
|
||||
put_tty_driver(tty_drv);
|
||||
tty_driver_kref_put(tty_drv);
|
||||
}
|
||||
|
||||
/* Module definitions */
|
||||
|
||||
@@ -1082,7 +1082,7 @@ static int __init tty3215_init(void)
|
||||
|
||||
ret = ccw_driver_register(&raw3215_ccw_driver);
|
||||
if (ret) {
|
||||
put_tty_driver(driver);
|
||||
tty_driver_kref_put(driver);
|
||||
return ret;
|
||||
}
|
||||
/*
|
||||
@@ -1104,7 +1104,7 @@ static int __init tty3215_init(void)
|
||||
tty_set_operations(driver, &tty3215_ops);
|
||||
ret = tty_register_driver(driver);
|
||||
if (ret) {
|
||||
put_tty_driver(driver);
|
||||
tty_driver_kref_put(driver);
|
||||
return ret;
|
||||
}
|
||||
tty3215_driver = driver;
|
||||
|
||||
@@ -509,14 +509,14 @@ sclp_tty_init(void)
|
||||
|
||||
rc = sclp_rw_init();
|
||||
if (rc) {
|
||||
put_tty_driver(driver);
|
||||
tty_driver_kref_put(driver);
|
||||
return rc;
|
||||
}
|
||||
/* Allocate pages for output buffering */
|
||||
for (i = 0; i < MAX_KMEM_PAGES; i++) {
|
||||
page = (void *) get_zeroed_page(GFP_KERNEL | GFP_DMA);
|
||||
if (page == NULL) {
|
||||
put_tty_driver(driver);
|
||||
tty_driver_kref_put(driver);
|
||||
return -ENOMEM;
|
||||
}
|
||||
list_add_tail((struct list_head *) page, &sclp_tty_pages);
|
||||
@@ -532,7 +532,7 @@ sclp_tty_init(void)
|
||||
|
||||
rc = sclp_register(&sclp_input_event);
|
||||
if (rc) {
|
||||
put_tty_driver(driver);
|
||||
tty_driver_kref_put(driver);
|
||||
return rc;
|
||||
}
|
||||
|
||||
@@ -552,7 +552,7 @@ sclp_tty_init(void)
|
||||
tty_port_link_device(&sclp_port, driver, 0);
|
||||
rc = tty_register_driver(driver);
|
||||
if (rc) {
|
||||
put_tty_driver(driver);
|
||||
tty_driver_kref_put(driver);
|
||||
tty_port_destroy(&sclp_port);
|
||||
return rc;
|
||||
}
|
||||
|
||||
@@ -763,7 +763,7 @@ out_reg:
|
||||
out_init:
|
||||
__sclp_vt220_cleanup();
|
||||
out_driver:
|
||||
put_tty_driver(driver);
|
||||
tty_driver_kref_put(driver);
|
||||
return rc;
|
||||
}
|
||||
__initcall(sclp_vt220_tty_init);
|
||||
|
||||
@@ -1935,7 +1935,7 @@ static int __init tty3270_init(void)
|
||||
tty_set_operations(driver, &tty3270_ops);
|
||||
ret = tty_register_driver(driver);
|
||||
if (ret) {
|
||||
put_tty_driver(driver);
|
||||
tty_driver_kref_put(driver);
|
||||
return ret;
|
||||
}
|
||||
tty3270_driver = driver;
|
||||
@@ -1952,7 +1952,7 @@ tty3270_exit(void)
|
||||
driver = tty3270_driver;
|
||||
tty3270_driver = NULL;
|
||||
tty_unregister_driver(driver);
|
||||
put_tty_driver(driver);
|
||||
tty_driver_kref_put(driver);
|
||||
tty3270_del_views();
|
||||
}
|
||||
|
||||
|
||||
@@ -2852,11 +2852,11 @@ unregister_loop:
|
||||
tty_unregister_driver(fwloop_driver);
|
||||
put_loop:
|
||||
if (create_loop_dev)
|
||||
put_tty_driver(fwloop_driver);
|
||||
tty_driver_kref_put(fwloop_driver);
|
||||
unregister_driver:
|
||||
tty_unregister_driver(fwtty_driver);
|
||||
put_tty:
|
||||
put_tty_driver(fwtty_driver);
|
||||
tty_driver_kref_put(fwtty_driver);
|
||||
remove_debugfs:
|
||||
debugfs_remove_recursive(fwserial_debugfs);
|
||||
|
||||
@@ -2871,10 +2871,10 @@ static void __exit fwserial_exit(void)
|
||||
kmem_cache_destroy(fwtty_txn_cache);
|
||||
if (create_loop_dev) {
|
||||
tty_unregister_driver(fwloop_driver);
|
||||
put_tty_driver(fwloop_driver);
|
||||
tty_driver_kref_put(fwloop_driver);
|
||||
}
|
||||
tty_unregister_driver(fwtty_driver);
|
||||
put_tty_driver(fwtty_driver);
|
||||
tty_driver_kref_put(fwtty_driver);
|
||||
debugfs_remove_recursive(fwserial_debugfs);
|
||||
}
|
||||
|
||||
|
||||
@@ -299,7 +299,7 @@ int register_lte_tty_driver(void)
|
||||
|
||||
ret = tty_register_driver(tty_driver);
|
||||
if (ret) {
|
||||
put_tty_driver(tty_driver);
|
||||
tty_driver_kref_put(tty_driver);
|
||||
return ret;
|
||||
}
|
||||
|
||||
@@ -318,7 +318,7 @@ void unregister_lte_tty_driver(void)
|
||||
tty_driver = gdm_driver[i];
|
||||
if (tty_driver) {
|
||||
tty_unregister_driver(tty_driver);
|
||||
put_tty_driver(tty_driver);
|
||||
tty_driver_kref_put(tty_driver);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -973,7 +973,7 @@ static int gb_tty_init(void)
|
||||
return 0;
|
||||
|
||||
fail_put_gb_tty:
|
||||
put_tty_driver(gb_tty_driver);
|
||||
tty_driver_kref_put(gb_tty_driver);
|
||||
fail_unregister_dev:
|
||||
return retval;
|
||||
}
|
||||
@@ -981,7 +981,7 @@ fail_unregister_dev:
|
||||
static void gb_tty_exit(void)
|
||||
{
|
||||
tty_unregister_driver(gb_tty_driver);
|
||||
put_tty_driver(gb_tty_driver);
|
||||
tty_driver_kref_put(gb_tty_driver);
|
||||
idr_destroy(&tty_minors);
|
||||
}
|
||||
|
||||
|
||||
@@ -1519,7 +1519,7 @@ static int __init amiga_serial_probe(struct platform_device *pdev)
|
||||
|
||||
error = tty_register_driver(driver);
|
||||
if (error)
|
||||
goto fail_put_tty_driver;
|
||||
goto fail_tty_driver_kref_put;
|
||||
|
||||
printk(KERN_INFO "ttyS0 is the amiga builtin serial port\n");
|
||||
|
||||
@@ -1566,9 +1566,9 @@ fail_free_irq:
|
||||
free_irq(IRQ_AMIGA_TBE, state);
|
||||
fail_unregister:
|
||||
tty_unregister_driver(driver);
|
||||
fail_put_tty_driver:
|
||||
fail_tty_driver_kref_put:
|
||||
tty_port_destroy(&state->tport);
|
||||
put_tty_driver(driver);
|
||||
tty_driver_kref_put(driver);
|
||||
return error;
|
||||
}
|
||||
|
||||
@@ -1577,7 +1577,7 @@ static int __exit amiga_serial_remove(struct platform_device *pdev)
|
||||
struct serial_state *state = platform_get_drvdata(pdev);
|
||||
|
||||
tty_unregister_driver(serial_driver);
|
||||
put_tty_driver(serial_driver);
|
||||
tty_driver_kref_put(serial_driver);
|
||||
tty_port_destroy(&state->tport);
|
||||
|
||||
free_irq(IRQ_AMIGA_TBE, state);
|
||||
|
||||
@@ -791,7 +791,7 @@ static int __init ehv_bc_init(void)
|
||||
ret = tty_register_driver(driver);
|
||||
if (ret) {
|
||||
pr_err("ehv-bc: could not register tty driver (ret=%i)\n", ret);
|
||||
goto err_put_tty_driver;
|
||||
goto err_tty_driver_kref_put;
|
||||
}
|
||||
|
||||
ehv_bc_driver = driver;
|
||||
@@ -808,8 +808,8 @@ static int __init ehv_bc_init(void)
|
||||
err_deregister_tty_driver:
|
||||
ehv_bc_driver = NULL;
|
||||
tty_unregister_driver(driver);
|
||||
err_put_tty_driver:
|
||||
put_tty_driver(driver);
|
||||
err_tty_driver_kref_put:
|
||||
tty_driver_kref_put(driver);
|
||||
err_free_bcs:
|
||||
kfree(bcs);
|
||||
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user