2012-10-18 15:13:40

by Wei Yongjun

Subject: [PATCH] vme: vme_ca91cx42.c: use module_pci_driver to simplify the code

From: Wei Yongjun <[email protected]>

Use the module_pci_driver() macro to make the code simpler
by eliminating module_init and module_exit calls.

dpatch engine is used to auto generate this patch.
(https://github.com/weiyj/dpatch)

Signed-off-by: Wei Yongjun <[email protected]>
---
drivers/vme/bridges/vme_ca91cx42.c | 15 +--------------
1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/drivers/vme/bridges/vme_ca91cx42.c b/drivers/vme/bridges/vme_ca91cx42.c
index 1425d22c..64bfea3 100644
--- a/drivers/vme/bridges/vme_ca91cx42.c
+++ b/drivers/vme/bridges/vme_ca91cx42.c
@@ -34,10 +34,8 @@
#include "../vme_bridge.h"
#include "vme_ca91cx42.h"

-static int __init ca91cx42_init(void);
static int ca91cx42_probe(struct pci_dev *, const struct pci_device_id *);
static void ca91cx42_remove(struct pci_dev *);
-static void __exit ca91cx42_exit(void);

/* Module parameters */
static int geoid;
@@ -1523,11 +1521,6 @@ static void ca91cx42_free_consistent(struct device *parent, size_t size,
pci_free_consistent(pdev, size, vaddr, dma);
}

-static int __init ca91cx42_init(void)
-{
- return pci_register_driver(&ca91cx42_driver);
-}
-
/*
* Configure CR/CSR space
*
@@ -1944,16 +1937,10 @@ static void ca91cx42_remove(struct pci_dev *pdev)
kfree(ca91cx42_bridge);
}

-static void __exit ca91cx42_exit(void)
-{
- pci_unregister_driver(&ca91cx42_driver);
-}
+module_pci_driver(ca91cx42_driver);

MODULE_PARM_DESC(geoid, "Override geographical addressing");
module_param(geoid, int, 0);

MODULE_DESCRIPTION("VME driver for the Tundra Universe II VME bridge");
MODULE_LICENSE("GPL");
-
-module_init(ca91cx42_init);
-module_exit(ca91cx42_exit);

2012-11-02 15:33:21

by Martyn Welch

Subject: Re: [PATCH] vme: vme_ca91cx42.c: use module_pci_driver to simplify the code

On 18/10/2012 16:13, Wei Yongjun wrote:
> From: Wei Yongjun <[email protected]>
>
> Use the module_pci_driver() macro to make the code simpler
> by eliminating module_init and module_exit calls.
>
> dpatch engine is used to auto generate this patch.
> (https://github.com/weiyj/dpatch)
>
> Signed-off-by: Wei Yongjun <[email protected]>

Acked-by: Martyn Welch <[email protected]>

> ---
> drivers/vme/bridges/vme_ca91cx42.c | 15 +--------------
> 1 file changed, 1 insertion(+), 14 deletions(-)
>
> diff --git a/drivers/vme/bridges/vme_ca91cx42.c b/drivers/vme/bridges/vme_ca91cx42.c
> index 1425d22c..64bfea3 100644
> --- a/drivers/vme/bridges/vme_ca91cx42.c
> +++ b/drivers/vme/bridges/vme_ca91cx42.c
> @@ -34,10 +34,8 @@
> #include "../vme_bridge.h"
> #include "vme_ca91cx42.h"
>
> -static int __init ca91cx42_init(void);
> static int ca91cx42_probe(struct pci_dev *, const struct pci_device_id *);
> static void ca91cx42_remove(struct pci_dev *);
> -static void __exit ca91cx42_exit(void);
>
> /* Module parameters */
> static int geoid;
> @@ -1523,11 +1521,6 @@ static void ca91cx42_free_consistent(struct device *parent, size_t size,
> pci_free_consistent(pdev, size, vaddr, dma);
> }
>
> -static int __init ca91cx42_init(void)
> -{
> - return pci_register_driver(&ca91cx42_driver);
> -}
> -
> /*
> * Configure CR/CSR space
> *
> @@ -1944,16 +1937,10 @@ static void ca91cx42_remove(struct pci_dev *pdev)
> kfree(ca91cx42_bridge);
> }
>
> -static void __exit ca91cx42_exit(void)
> -{
> - pci_unregister_driver(&ca91cx42_driver);
> -}
> +module_pci_driver(ca91cx42_driver);
>
> MODULE_PARM_DESC(geoid, "Override geographical addressing");
> module_param(geoid, int, 0);
>
> MODULE_DESCRIPTION("VME driver for the Tundra Universe II VME bridge");
> MODULE_LICENSE("GPL");
> -
> -module_init(ca91cx42_init);
> -module_exit(ca91cx42_exit);
>


--
Martyn Welch (Lead Software Engineer) | Registered in England and Wales
GE Intelligent Platforms | (3828642) at 100 Barbirolli Square
T +44(0)1327322748 | Manchester, M2 3AB
E [email protected] | VAT:GB 927559189