diff options
Diffstat (limited to 'drivers/ata/pata_mpiix.c')
-rw-r--r-- | drivers/ata/pata_mpiix.c | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/drivers/ata/pata_mpiix.c b/drivers/ata/pata_mpiix.c index 4ccca938675e..c4a1b10f3bca 100644 --- a/drivers/ata/pata_mpiix.c +++ b/drivers/ata/pata_mpiix.c | |||
@@ -194,8 +194,6 @@ static struct ata_port_operations mpiix_port_ops = { | |||
194 | .irq_clear = ata_bmdma_irq_clear, | 194 | .irq_clear = ata_bmdma_irq_clear, |
195 | 195 | ||
196 | .port_start = ata_port_start, | 196 | .port_start = ata_port_start, |
197 | .port_stop = ata_port_stop, | ||
198 | .host_stop = ata_host_stop | ||
199 | }; | 197 | }; |
200 | 198 | ||
201 | static int mpiix_init_one(struct pci_dev *dev, const struct pci_device_id *id) | 199 | static int mpiix_init_one(struct pci_dev *dev, const struct pci_device_id *id) |
@@ -258,24 +256,6 @@ static int mpiix_init_one(struct pci_dev *dev, const struct pci_device_id *id) | |||
258 | return -ENODEV; | 256 | return -ENODEV; |
259 | } | 257 | } |
260 | 258 | ||
261 | /** | ||
262 | * mpiix_remove_one - device unload | ||
263 | * @pdev: PCI device being removed | ||
264 | * | ||
265 | * Handle an unplug/unload event for a PCI device. Unload the | ||
266 | * PCI driver but do not use the default handler as we *MUST NOT* | ||
267 | * disable the device as it has other functions. | ||
268 | */ | ||
269 | |||
270 | static void __devexit mpiix_remove_one(struct pci_dev *pdev) | ||
271 | { | ||
272 | struct device *dev = pci_dev_to_dev(pdev); | ||
273 | struct ata_host *host = dev_get_drvdata(dev); | ||
274 | |||
275 | ata_host_remove(host); | ||
276 | dev_set_drvdata(dev, NULL); | ||
277 | } | ||
278 | |||
279 | static const struct pci_device_id mpiix[] = { | 259 | static const struct pci_device_id mpiix[] = { |
280 | { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_82371MX), }, | 260 | { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_82371MX), }, |
281 | 261 | ||
@@ -286,7 +266,7 @@ static struct pci_driver mpiix_pci_driver = { | |||
286 | .name = DRV_NAME, | 266 | .name = DRV_NAME, |
287 | .id_table = mpiix, | 267 | .id_table = mpiix, |
288 | .probe = mpiix_init_one, | 268 | .probe = mpiix_init_one, |
289 | .remove = mpiix_remove_one, | 269 | .remove = ata_pci_remove_one, |
290 | .suspend = ata_pci_device_suspend, | 270 | .suspend = ata_pci_device_suspend, |
291 | .resume = ata_pci_device_resume, | 271 | .resume = ata_pci_device_resume, |
292 | }; | 272 | }; |