summaryrefslogtreecommitdiffstats
path: root/drivers/firewire
diff options
context:
space:
mode:
authorStephan Gatzka <stephan.gatzka@gmail.com>2013-08-26 20:50:04 +0200
committerStefan Richter <stefanr@s5r6.in-berlin.de>2013-08-29 22:30:54 +0200
commit7a723c6ed9e92bf91db5c65542c78106030afdbe (patch)
treea9901f45a18ca6fad3c1c3592388115e36c54aeb /drivers/firewire
parent0dbe15f88be5b2cdf4ca4145797861dfb0d583a5 (diff)
downloadop-kernel-dev-7a723c6ed9e92bf91db5c65542c78106030afdbe.zip
op-kernel-dev-7a723c6ed9e92bf91db5c65542c78106030afdbe.tar.gz
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>
Diffstat (limited to 'drivers/firewire')
-rw-r--r--drivers/firewire/ohci.c13
1 files changed, 12 insertions, 1 deletions
diff --git a/drivers/firewire/ohci.c b/drivers/firewire/ohci.c
index 04e6eb1..80830d6 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");
OpenPOWER on IntegriCloud