diff options
Diffstat (limited to 'drivers/ide/pci/slc90e66.c')
-rw-r--r-- | drivers/ide/pci/slc90e66.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/drivers/ide/pci/slc90e66.c b/drivers/ide/pci/slc90e66.c index dae6e2c94d86..13d1fa491f26 100644 --- a/drivers/ide/pci/slc90e66.c +++ b/drivers/ide/pci/slc90e66.c | |||
@@ -15,6 +15,8 @@ | |||
15 | #include <linux/ide.h> | 15 | #include <linux/ide.h> |
16 | #include <linux/init.h> | 16 | #include <linux/init.h> |
17 | 17 | ||
18 | #define DRV_NAME "slc90e66" | ||
19 | |||
18 | static DEFINE_SPINLOCK(slc90e66_lock); | 20 | static DEFINE_SPINLOCK(slc90e66_lock); |
19 | 21 | ||
20 | static void slc90e66_set_pio_mode(ide_drive_t *drive, const u8 pio) | 22 | static void slc90e66_set_pio_mode(ide_drive_t *drive, const u8 pio) |
@@ -132,7 +134,7 @@ static const struct ide_port_ops slc90e66_port_ops = { | |||
132 | }; | 134 | }; |
133 | 135 | ||
134 | static const struct ide_port_info slc90e66_chipset __devinitdata = { | 136 | static const struct ide_port_info slc90e66_chipset __devinitdata = { |
135 | .name = "SLC90E66", | 137 | .name = DRV_NAME, |
136 | .enablebits = { {0x41, 0x80, 0x80}, {0x43, 0x80, 0x80} }, | 138 | .enablebits = { {0x41, 0x80, 0x80}, {0x43, 0x80, 0x80} }, |
137 | .port_ops = &slc90e66_port_ops, | 139 | .port_ops = &slc90e66_port_ops, |
138 | .host_flags = IDE_HFLAG_LEGACY_IRQS, | 140 | .host_flags = IDE_HFLAG_LEGACY_IRQS, |
@@ -144,7 +146,7 @@ static const struct ide_port_info slc90e66_chipset __devinitdata = { | |||
144 | 146 | ||
145 | static int __devinit slc90e66_init_one(struct pci_dev *dev, const struct pci_device_id *id) | 147 | static int __devinit slc90e66_init_one(struct pci_dev *dev, const struct pci_device_id *id) |
146 | { | 148 | { |
147 | return ide_setup_pci_device(dev, &slc90e66_chipset); | 149 | return ide_pci_init_one(dev, &slc90e66_chipset, NULL); |
148 | } | 150 | } |
149 | 151 | ||
150 | static const struct pci_device_id slc90e66_pci_tbl[] = { | 152 | static const struct pci_device_id slc90e66_pci_tbl[] = { |
@@ -157,6 +159,7 @@ static struct pci_driver driver = { | |||
157 | .name = "SLC90e66_IDE", | 159 | .name = "SLC90e66_IDE", |
158 | .id_table = slc90e66_pci_tbl, | 160 | .id_table = slc90e66_pci_tbl, |
159 | .probe = slc90e66_init_one, | 161 | .probe = slc90e66_init_one, |
162 | .remove = ide_pci_remove, | ||
160 | }; | 163 | }; |
161 | 164 | ||
162 | static int __init slc90e66_ide_init(void) | 165 | static int __init slc90e66_ide_init(void) |
@@ -164,7 +167,13 @@ static int __init slc90e66_ide_init(void) | |||
164 | return ide_pci_register_driver(&driver); | 167 | return ide_pci_register_driver(&driver); |
165 | } | 168 | } |
166 | 169 | ||
170 | static void __exit slc90e66_ide_exit(void) | ||
171 | { | ||
172 | pci_unregister_driver(&driver); | ||
173 | } | ||
174 | |||
167 | module_init(slc90e66_ide_init); | 175 | module_init(slc90e66_ide_init); |
176 | module_exit(slc90e66_ide_exit); | ||
168 | 177 | ||
169 | MODULE_AUTHOR("Andre Hedrick"); | 178 | MODULE_AUTHOR("Andre Hedrick"); |
170 | MODULE_DESCRIPTION("PCI driver module for SLC90E66 IDE"); | 179 | MODULE_DESCRIPTION("PCI driver module for SLC90E66 IDE"); |