2015-07-07 07:23:53

by Vaishali Thakkar

Subject: [PATCH] mtd: denali: Use module_pci_driver

Use module_pci_driver for drivers whose init and exit functions
only register and unregister, respectively.

A simplified version of the Coccinelle semantic patch that performs
this transformation is as follows:

@a@
identifier f, x;
@@
-static f(...) { return pci_register_driver(&x); }

@b depends on a@
identifier e, a.x;
@@
-static e(...) { pci_unregister_driver(&x); }

@c depends on a && b@
identifier a.f;
declarer name module_init;
@@
-module_init(f);

@d depends on a && b && c@
identifier b.e, a.x;
declarer name module_exit;
declarer name module_pci_driver;
@@
-module_exit(e);
+module_pci_driver(x);

Signed-off-by: Vaishali Thakkar <[email protected]>
---
drivers/mtd/nand/denali_pci.c | 13 +------------
1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/drivers/mtd/nand/denali_pci.c b/drivers/mtd/nand/denali_pci.c
index 6e2f387..a47a14c 100644
--- a/drivers/mtd/nand/denali_pci.c
+++ b/drivers/mtd/nand/denali_pci.c
@@ -128,15 +128,4 @@ static struct pci_driver denali_pci_driver = {
.probe = denali_pci_probe,
.remove = denali_pci_remove,
};
-
-static int denali_init_pci(void)
-{
- return pci_register_driver(&denali_pci_driver);
-}
-module_init(denali_init_pci);
-
-static void denali_exit_pci(void)
-{
- pci_unregister_driver(&denali_pci_driver);
-}
-module_exit(denali_exit_pci);
+module_pci_driver(denali_pci_driver);
--
1.9.1

2015-08-19 00:32:23

by Brian Norris

Subject: Re: [PATCH] mtd: denali: Use module_pci_driver

On Tue, Jul 07, 2015 at 12:53:45PM +0530, Vaishali Thakkar wrote:
> Use module_pci_driver for drivers whose init and exit functions
> only register and unregister, respectively.
>
> A simplified version of the Coccinelle semantic patch that performs
> this transformation is as follows:
>
> @a@
> identifier f, x;
> @@
> -static f(...) { return pci_register_driver(&x); }
>
> @b depends on a@
> identifier e, a.x;
> @@
> -static e(...) { pci_unregister_driver(&x); }
>
> @c depends on a && b@
> identifier a.f;
> declarer name module_init;
> @@
> -module_init(f);
>
> @d depends on a && b && c@
> identifier b.e, a.x;
> declarer name module_exit;
> declarer name module_pci_driver;
> @@
> -module_exit(e);
> +module_pci_driver(x);
>
> Signed-off-by: Vaishali Thakkar <[email protected]>

It seems I got 3 independent versions of the same patch... I pushed the
most recent one, then noticed this one. Thanks anyway.

Brian

2015-08-19 02:36:58

by Vaishali Thakkar

Subject: Re: [PATCH] mtd: denali: Use module_pci_driver

On Wed, Aug 19, 2015 at 6:02 AM, Brian Norris
<[email protected]> wrote:
>
> On Tue, Jul 07, 2015 at 12:53:45PM +0530, Vaishali Thakkar wrote:
> > Use module_pci_driver for drivers whose init and exit functions
> > only register and unregister, respectively.
> >
> > A simplified version of the Coccinelle semantic patch that performs
> > this transformation is as follows:
> >
> > @a@
> > identifier f, x;
> > @@
> > -static f(...) { return pci_register_driver(&x); }
> >
> > @b depends on a@
> > identifier e, a.x;
> > @@
> > -static e(...) { pci_unregister_driver(&x); }
> >
> > @c depends on a && b@
> > identifier a.f;
> > declarer name module_init;
> > @@
> > -module_init(f);
> >
> > @d depends on a && b && c@
> > identifier b.e, a.x;
> > declarer name module_exit;
> > declarer name module_pci_driver;
> > @@
> > -module_exit(e);
> > +module_pci_driver(x);
> >
> > Signed-off-by: Vaishali Thakkar <[email protected]>
>
> It seems I got 3 independent versions of the same patch... I pushed the
> most recent one, then noticed this one. Thanks anyway.

No problem. It's fine with me.

> Brian




--
Vaishali