2013-05-27 02:29:15

by Libo Chen

Subject: [PATCH 09/24] drivers/pci/ioapic: Convert to module_pci_driver

use module_pci_driver instead of init/exit, make code clean.

Signed-off-by: Libo Chen <[email protected]>
---
drivers/pci/ioapic.c | 13 +------------
1 files changed, 1 insertions(+), 12 deletions(-)

diff --git a/drivers/pci/ioapic.c b/drivers/pci/ioapic.c
index 3c6bbdd..1b90579 100644
--- a/drivers/pci/ioapic.c
+++ b/drivers/pci/ioapic.c
@@ -113,17 +113,6 @@ static struct pci_driver ioapic_driver = {
.remove = ioapic_remove,
};

-static int __init ioapic_init(void)
-{
- return pci_register_driver(&ioapic_driver);
-}
-
-static void __exit ioapic_exit(void)
-{
- pci_unregister_driver(&ioapic_driver);
-}
-
-module_init(ioapic_init);
-module_exit(ioapic_exit);
+module_pci_driver(ioapic_driver);

MODULE_LICENSE("GPL");
--
1.7.1

2013-05-27 23:07:09

by Bjorn Helgaas

Subject: Re: [PATCH 09/24] drivers/pci/ioapic: Convert to module_pci_driver

On Sun, May 26, 2013 at 8:28 PM, Libo Chen <[email protected]> wrote:
> use module_pci_driver instead of init/exit, make code clean.
>
> Signed-off-by: Libo Chen <[email protected]>
> ---
> drivers/pci/ioapic.c | 13 +------------
> 1 files changed, 1 insertions(+), 12 deletions(-)

Applied to my pci/misc branch for v3.11, thanks!

> diff --git a/drivers/pci/ioapic.c b/drivers/pci/ioapic.c
> index 3c6bbdd..1b90579 100644
> --- a/drivers/pci/ioapic.c
> +++ b/drivers/pci/ioapic.c
> @@ -113,17 +113,6 @@ static struct pci_driver ioapic_driver = {
> .remove = ioapic_remove,
> };
>
> -static int __init ioapic_init(void)
> -{
> - return pci_register_driver(&ioapic_driver);
> -}
> -
> -static void __exit ioapic_exit(void)
> -{
> - pci_unregister_driver(&ioapic_driver);
> -}
> -
> -module_init(ioapic_init);
> -module_exit(ioapic_exit);
> +module_pci_driver(ioapic_driver);
>
> MODULE_LICENSE("GPL");
> --
> 1.7.1
>
>