From 5b219220726898fce8e355c4d3074b925ffcdbe5 Mon Sep 17 00:00:00 2001
From: Tomas Winkler <tomas.winkler@intel.com>
Date: Thu, 19 Jul 2012 09:45:32 +0300
Subject: [PATCH] --- yaml --- r: 318248 b: refs/heads/master c:
 6078188e2ba1d61a2119ddb2289e88c2c2a015ab h: refs/heads/master v: v3

---
 [refs]                        |  2 +-
 trunk/drivers/misc/mei/main.c | 39 +----------------------------------
 2 files changed, 2 insertions(+), 39 deletions(-)

diff --git a/[refs] b/[refs]
index 93071c1355b2..837af9e52639 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5b1f6d81e4c63ae30d92678cc35081001add7674
+refs/heads/master: 6078188e2ba1d61a2119ddb2289e88c2c2a015ab
diff --git a/trunk/drivers/misc/mei/main.c b/trunk/drivers/misc/mei/main.c
index 0d98c2ee6fe3..092330208869 100644
--- a/trunk/drivers/misc/mei/main.c
+++ b/trunk/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");