[PATCH 44/70] mxser: inline mxser_board_remove into mxser_remove

From: Jiri Slaby
Date: Fri Jun 18 2021 - 02:18:51 EST


The only user of mxser_board_remove is mxser_remove. Move there those
few lines.

Signed-off-by: Jiri Slaby <jslaby@xxxxxxx>
---
drivers/tty/mxser.c | 19 +++++++------------
1 file 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 @@ static int mxser_probe(struct pci_dev *pdev,
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);
--
2.32.0