diff options
| author |   Jiri Slaby <jslaby@suse.cz> | 2021-06-18 08:14:50 +0200 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-06-18 13:10:01 +0200 |
| commit | d450f0852fccccc4ae7ec4103e146ae1b61a6fef (patch) | |
| tree | 1a80f35814b2196b9e409eedc24b43050193626f /drivers/tty | |
| parent | mxser: move board init into mxser_initbrd (diff) | |
| download | linux-dev-d450f0852fccccc4ae7ec4103e146ae1b61a6fef.tar.xz linux-dev-d450f0852fccccc4ae7ec4103e146ae1b61a6fef.zip | |
mxser: inline mxser_board_remove into mxser_remove
The only user of mxser_board_remove is mxser_remove. Move there those
few lines.
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Link: https://lore.kernel.org/r/20210618061516.662-45-jslaby@suse.cz
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty')
| -rw-r--r-- | drivers/tty/mxser.c | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/drivers/tty/mxser.c b/drivers/tty/mxser.c index 3b20eb96d788..196750676400 100644 --- a/drivers/tty/mxser.c +++ b/drivers/tty/mxser.c @@ -1953,17 +1953,6 @@ static int mxser_initbrd(struct mxser_board *brd) return retval; } -static void mxser_board_remove(struct mxser_board *brd) -{ - unsigned int i; - - for (i = 0; i < brd->info->nports; i++) { - tty_unregister_device(mxvar_sdriver, brd->idx + i); - tty_port_destroy(&brd->ports[i].port); - } - free_irq(brd->irq, brd); -} - static int mxser_probe(struct pci_dev *pdev, const struct pci_device_id *ent) { @@ -2053,8 +2042,14 @@ err: static void mxser_remove(struct pci_dev *pdev) { struct mxser_board *brd = pci_get_drvdata(pdev); + unsigned int i; + + for (i = 0; i < brd->info->nports; i++) { + tty_unregister_device(mxvar_sdriver, brd->idx + i); + tty_port_destroy(&brd->ports[i].port); + } - mxser_board_remove(brd); + free_irq(brd->irq, brd); pci_release_region(pdev, 2); pci_release_region(pdev, 3); |