sis5513: add ->remove method and module_exit()

[linux-2.6-omap-h63xx.git] / drivers / ide / pci / sis5513.c

diff --git a/drivers/ide/pci/sis5513.c b/drivers/ide/pci/sis5513.c
index e127eb25ab6330e3e08d9f148e5d445f05029450..f3cf7c6c0cc3417c2e79a6dcdd59b6da578492f2 100644 (file)
--- a/drivers/ide/pci/sis5513.c
+++ b/drivers/ide/pci/sis5513.c
@@ -52,8 +52,6 @@
 #include <linux/init.h>
 #include <linux/ide.h>
 
-#include "ide-timing.h"
-
 /* registers layout and init values are chipset family dependant */
 
 #define ATA_16         0x01
@@ -585,7 +583,13 @@ static int __devinit sis5513_init_one(struct pci_dev *dev, const struct pci_devi
 
        d.udma_mask = udma_rates[chipset_family];
 
-       return ide_setup_pci_device(dev, &d);
+       return ide_pci_init_one(dev, &d, NULL);
+}
+
+static void __devexit sis5513_remove(struct pci_dev *dev)
+{
+       ide_pci_remove(dev);
+       pci_disable_device(dev);
 }
 
 static const struct pci_device_id sis5513_pci_tbl[] = {
@@ -600,6 +604,7 @@ static struct pci_driver driver = {
        .name           = "SIS_IDE",
        .id_table       = sis5513_pci_tbl,
        .probe          = sis5513_init_one,
+       .remove         = sis5513_remove,
 };
 
 static int __init sis5513_ide_init(void)
@@ -607,7 +612,13 @@ static int __init sis5513_ide_init(void)
        return ide_pci_register_driver(&driver);
 }
 
+static void __exit sis5513_ide_exit(void)
+{
+       pci_unregister_driver(&driver);
+}
+
 module_init(sis5513_ide_init);
+module_exit(sis5513_ide_exit);
 
 MODULE_AUTHOR("Lionel Bouton, L C Chang, Andre Hedrick, Vojtech Pavlik");
 MODULE_DESCRIPTION("PCI driver module for SIS IDE");
@@ -616,7 +627,6 @@ MODULE_LICENSE("GPL");
 /*
  * TODO:
  *     - CLEANUP
- *     - Use drivers/ide/ide-timing.h !
  *     - More checks in the config registers (force values instead of
  *       relying on the BIOS setting them correctly).
  *     - Further optimisations ?