[char-misc-next] mei: use module_pci_driver

[char-misc-next] mei: use module_pci_driver

[Tomas Winkler]

Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
---
 drivers/misc/mei/main.c |   39 +--------------------------------------
 1 files changed, 1 insertions(+), 38 deletions(-)

diff --git a/drivers/misc/mei/main.c b/drivers/misc/mei/main.c
index 0d98c2e..0923302 100644
--- a/drivers/misc/mei/main.c
+++ b/drivers/misc/mei/main.c
@@ -1182,44 +1182,7 @@ static struct pci_driver mei_driver = {
 	.driver.pm = MEI_PM_OPS,
 };
 
-/**
- * mei_init_module - Driver Registration Routine
- *
- * mei_init_module is the first routine called when the driver is
- * loaded. All it does is to register with the PCI subsystem.
- *
- * returns 0 on success, <0 on failure.
- */
-static int __init mei_init_module(void)
-{
-	int ret;
-
-	pr_debug("loading.\n");
-	/* init pci module */
-	ret = pci_register_driver(&mei_driver);
-	if (ret < 0)
-		pr_err("error registering driver.\n");
-
-	return ret;
-}
-
-module_init(mei_init_module);
-
-/**
- * mei_exit_module - Driver Exit Cleanup Routine
- *
- * mei_exit_module is called just before the driver is removed
- * from memory.
- */
-static void __exit mei_exit_module(void)
-{
-	pci_unregister_driver(&mei_driver);
-
-	pr_debug("unloaded successfully.\n");
-}
-
-module_exit(mei_exit_module);
-
+module_pci_driver(mei_driver);
 
 MODULE_AUTHOR("Intel Corporation");
 MODULE_DESCRIPTION("Intel(R) Management Engine Interface");
-- 
1.7.4.4

[char-misc-next] mei: use module_pci_driver

[Tomas Winkler]

Change-Id: I960feed4157ad1b178f68f4a0b3968e185ed0b36
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
---
 drivers/misc/mei/main.c |   39 +--------------------------------------
 1 files changed, 1 insertions(+), 38 deletions(-)

diff --git a/drivers/misc/mei/main.c b/drivers/misc/mei/main.c
index 0d98c2e..0923302 100644
--- a/drivers/misc/mei/main.c
+++ b/drivers/misc/mei/main.c
@@ -1182,44 +1182,7 @@ static struct pci_driver mei_driver = {
 	.driver.pm = MEI_PM_OPS,
 };
 
-/**
- * mei_init_module - Driver Registration Routine
- *
- * mei_init_module is the first routine called when the driver is
- * loaded. All it does is to register with the PCI subsystem.
- *
- * returns 0 on success, <0 on failure.
- */
-static int __init mei_init_module(void)
-{
-	int ret;
-
-	pr_debug("loading.\n");
-	/* init pci module */
-	ret = pci_register_driver(&mei_driver);
-	if (ret < 0)
-		pr_err("error registering driver.\n");
-
-	return ret;
-}
-
-module_init(mei_init_module);
-
-/**
- * mei_exit_module - Driver Exit Cleanup Routine
- *
- * mei_exit_module is called just before the driver is removed
- * from memory.
- */
-static void __exit mei_exit_module(void)
-{
-	pci_unregister_driver(&mei_driver);
-
-	pr_debug("unloaded successfully.\n");
-}
-
-module_exit(mei_exit_module);
-
+module_pci_driver(mei_driver);
 
 MODULE_AUTHOR("Intel Corporation");
 MODULE_DESCRIPTION("Intel(R) Management Engine Interface");
-- 
1.7.4.4

Re: [char-misc-next] mei: use module_pci_driver

[Arnd Bergmann]

On Tuesday 17 July 2012, Tomas Winkler wrote:
> 
> Change-Id: I960feed4157ad1b178f68f4a0b3968e185ed0b36

The change log got mangled. Please make sure the text you have here actually
describes what the patch does and why.

> Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
> ---
>  drivers/misc/mei/main.c |   39 +--------------------------------------
>  1 files changed, 1 insertions(+), 38 deletions(-)
For the actual changes:

Acked-by: Arnd Bergmann <arnd@arndb.de>

RE: [char-misc-next] mei: use module_pci_driver

[Winkler, Tomas]

> 
> On Tuesday 17 July 2012, Tomas Winkler wrote:
> >
> > Change-Id: I960feed4157ad1b178f68f4a0b3968e185ed0b36
> 
> The change log got mangled. Please make sure the text you have here
> actually describes what the patch does and why.
> 
Hmm, something went wrong with my scripts. Will look at that.
Thanks
Tomas

Re: [char-misc-next] mei: use module_pci_driver

[Greg KH]

On Tue, Jul 17, 2012 at 11:23:46AM +0300, Tomas Winkler wrote:
> Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>

This patch fails to apply to my tree :(

RE: [char-misc-next] mei: use module_pci_driver

[Winkler, Tomas]

> This patch fails to apply to my tree :(

Right, my mistake I haven't checked it directly with your tree,  I need to wait till you merge the upstream in. 
No rush, it's just a cleanup patch.

Thanks
Tomas

Re: [char-misc-next] mei: use module_pci_driver

[Greg KH]

On Tue, Jul 17, 2012 at 08:04:06PM +0000, Winkler, Tomas wrote:
> 
> > This patch fails to apply to my tree :(
> 
> Right, my mistake I haven't checked it directly with your tree,  I
> need to wait till you merge the upstream in. 

Merge what "upstream"?

greg k-h

RE: [char-misc-next] mei: use module_pci_driver

[Winkler, Tomas]

> > Right, my mistake I haven't checked it directly with your tree,  I
> > need to wait till you merge the upstream in.
> 
> Merge what "upstream"?

The doesn't apply    because the
 commit a44cab4aff7e72e7052521121fd8ceca51351534
 misc: mei: unregister misc device in pci_remove function
    
is only in Linus' master branch.

 Your branch char-misc-next is still at v3.5-rc2 
I believe that in some point you'll merge the whole Linus' master branch into your char-misc-next branch,
right?

Thanks
Tomas

Re: [char-misc-next] mei: use module_pci_driver

[Greg KH]

On Wed, Jul 18, 2012 at 07:42:32AM +0000, Winkler, Tomas wrote:
> > > Right, my mistake I haven't checked it directly with your tree,  I
> > > need to wait till you merge the upstream in.
> > 
> > Merge what "upstream"?
> 
> The doesn't apply    because the
>  commit a44cab4aff7e72e7052521121fd8ceca51351534
>  misc: mei: unregister misc device in pci_remove function
>     
> is only in Linus' master branch.
> 
>  Your branch char-misc-next is still at v3.5-rc2 
> I believe that in some point you'll merge the whole Linus' master
> branch into your char-misc-next branch, right?

Ah, yes, sorry, I didn't realize we needed the merge.  It's now done.

Care to resend your patch (in the proper format as discussed) so that I
can queue it up?

thanks,

greg k-h