2014-10-15 07:46:49

by Michael Opdenacker

Subject: [PATCH] atm: simplify lanai.c by using module_pci_driver

This simplifies the lanai.c driver by using
the module_pci_driver() macro, at the expense
of losing only debugging messages.

Signed-off-by: Michael Opdenacker <[email protected]>
---
drivers/atm/lanai.c | 22 +---------------------
1 file changed, 1 insertion(+), 21 deletions(-)

diff --git a/drivers/atm/lanai.c b/drivers/atm/lanai.c
index fa7d701933ba..93eaf8d94492 100644
--- a/drivers/atm/lanai.c
+++ b/drivers/atm/lanai.c
@@ -2614,27 +2614,7 @@ static struct pci_driver lanai_driver = {
.probe = lanai_init_one,
};

-static int __init lanai_module_init(void)
-{
- int x;
-
- x = pci_register_driver(&lanai_driver);
- if (x != 0)
- printk(KERN_ERR DEV_LABEL ": no adapter found\n");
- return x;
-}
-
-static void __exit lanai_module_exit(void)
-{
- /* We'll only get called when all the interfaces are already
- * gone, so there isn't much to do
- */
- DPRINTK("cleanup_module()\n");
- pci_unregister_driver(&lanai_driver);
-}
-
-module_init(lanai_module_init);
-module_exit(lanai_module_exit);
+module_pci_driver(lanai_driver);

MODULE_AUTHOR("Mitchell Blank Jr <[email protected]>");
MODULE_DESCRIPTION("Efficient Networks Speedstream 3010 driver");
--
1.9.1

2014-10-17 15:55:51

by David Miller

Subject: Re: [PATCH] atm: simplify lanai.c by using module_pci_driver

From: Michael Opdenacker <[email protected]>
Date: Wed, 15 Oct 2014 09:45:50 +0200

> This simplifies the lanai.c driver by using
> the module_pci_driver() macro, at the expense
> of losing only debugging messages.
>
> Signed-off-by: Michael Opdenacker <[email protected]>

Applied, thanks.