diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2010-01-08 03:11:01 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-01-08 03:11:01 -0500 |
commit | 4cd7d9247ffa2a27508c69563b66713519c196f5 (patch) | |
tree | d5e53ea77ea8007108b2fd6f4c1771b6ce224acc /drivers | |
parent | 1c8a375185935f8106a45221bd187b7b272f97c2 (diff) |
scc_pata: fix module unloading
scc_pata host driver predated module unloading support for IDE host
drivers so even though it supports PCI hot-unplug and implements
PCI device ->remove method it doesn't allow module removal. Fix it.
Add missing __init/__exit tags to module_init/module_exit functions
while at it (from Peter Huewe).
Noticed-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/ide/scc_pata.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/ide/scc_pata.c b/drivers/ide/scc_pata.c index 1104bb301eb9..8066168992d7 100644 --- a/drivers/ide/scc_pata.c +++ b/drivers/ide/scc_pata.c | |||
@@ -872,20 +872,18 @@ static struct pci_driver scc_pci_driver = { | |||
872 | .remove = __devexit_p(scc_remove), | 872 | .remove = __devexit_p(scc_remove), |
873 | }; | 873 | }; |
874 | 874 | ||
875 | static int scc_ide_init(void) | 875 | static int __init scc_ide_init(void) |
876 | { | 876 | { |
877 | return ide_pci_register_driver(&scc_pci_driver); | 877 | return ide_pci_register_driver(&scc_pci_driver); |
878 | } | 878 | } |
879 | 879 | ||
880 | module_init(scc_ide_init); | 880 | static void __exit scc_ide_exit(void) |
881 | /* -- No exit code? | ||
882 | static void scc_ide_exit(void) | ||
883 | { | 881 | { |
884 | ide_pci_unregister_driver(&scc_pci_driver); | 882 | pci_unregister_driver(&scc_pci_driver); |
885 | } | 883 | } |
886 | module_exit(scc_ide_exit); | ||
887 | */ | ||
888 | 884 | ||
885 | module_init(scc_ide_init); | ||
886 | module_exit(scc_ide_exit); | ||
889 | 887 | ||
890 | MODULE_DESCRIPTION("PCI driver module for Toshiba SCC IDE"); | 888 | MODULE_DESCRIPTION("PCI driver module for Toshiba SCC IDE"); |
891 | MODULE_LICENSE("GPL"); | 889 | MODULE_LICENSE("GPL"); |