mxser: inline mxser_board_remove into mxser_remove
authorJiri Slaby <jslaby@suse.cz>
Fri, 18 Jun 2021 06:14:50 +0000 (08:14 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 18 Jun 2021 11:10:01 +0000 (13:10 +0200)
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>
drivers/tty/mxser.c

index 3b20eb9..1967506 100644 (file)
@@ -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);