From: Stephan Gatzka <stephan.gatzka@gmail.com>
Date: Mon, 26 Aug 2013 18:50:04 +0000 (+0200)
Subject: firewire: ohci: Change module_pci_driver to module_init/module_exit
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=7a723c6ed9e92bf91db5c65542c78106030afdbe;p=deliverable%2Flinux.git

firewire: ohci: Change module_pci_driver to module_init/module_exit

This is a prerequisite to allocate a per driver self_id workqueue.
This reverts the ohci.c part of patch
fe2af11c220c7bb3a67f7aec0594811e5c59e019.

Signed-off-by: Stephan Gatzka <stephan.gatzka@gmail.com>
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
---

diff --git a/drivers/firewire/ohci.c b/drivers/firewire/ohci.c
index 04e6eb127b73..80830d6fe46b 100644
--- a/drivers/firewire/ohci.c
+++ b/drivers/firewire/ohci.c
@@ -3870,7 +3870,18 @@ static struct pci_driver fw_ohci_pci_driver = {
 #endif
 };
 
-module_pci_driver(fw_ohci_pci_driver);
+static int __init fw_ohci_init(void)
+{
+	return pci_register_driver(&fw_ohci_pci_driver);
+}
+
+static void __exit fw_ohci_cleanup(void)
+{
+	pci_unregister_driver(&fw_ohci_pci_driver);
+}
+
+module_init(fw_ohci_init);
+module_exit(fw_ohci_cleanup);
 
 MODULE_AUTHOR("Kristian Hoegsberg <krh@bitplanet.net>");
 MODULE_DESCRIPTION("Driver for PCI OHCI IEEE1394 controllers");