aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/ata/sata_nv.c12
1 files changed, 1 insertions, 11 deletions
diff --git a/drivers/ata/sata_nv.c b/drivers/ata/sata_nv.c
index 82a615db4d50..1a49c777fa6a 100644
--- a/drivers/ata/sata_nv.c
+++ b/drivers/ata/sata_nv.c
@@ -229,7 +229,6 @@ struct nv_host_priv {
229#define NV_ADMA_CHECK_INTR(GCTL, PORT) ((GCTL) & ( 1 << (19 + (12 * (PORT))))) 229#define NV_ADMA_CHECK_INTR(GCTL, PORT) ((GCTL) & ( 1 << (19 + (12 * (PORT)))))
230 230
231static int nv_init_one (struct pci_dev *pdev, const struct pci_device_id *ent); 231static int nv_init_one (struct pci_dev *pdev, const struct pci_device_id *ent);
232static void nv_remove_one (struct pci_dev *pdev);
233#ifdef CONFIG_PM 232#ifdef CONFIG_PM
234static int nv_pci_device_resume(struct pci_dev *pdev); 233static int nv_pci_device_resume(struct pci_dev *pdev);
235#endif 234#endif
@@ -300,7 +299,7 @@ static struct pci_driver nv_pci_driver = {
300 .suspend = ata_pci_device_suspend, 299 .suspend = ata_pci_device_suspend,
301 .resume = nv_pci_device_resume, 300 .resume = nv_pci_device_resume,
302#endif 301#endif
303 .remove = nv_remove_one, 302 .remove = ata_pci_remove_one,
304}; 303};
305 304
306static struct scsi_host_template nv_sht = { 305static struct scsi_host_template nv_sht = {
@@ -1607,15 +1606,6 @@ static int nv_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
1607 IRQF_SHARED, ppi[0]->sht); 1606 IRQF_SHARED, ppi[0]->sht);
1608} 1607}
1609 1608
1610static void nv_remove_one (struct pci_dev *pdev)
1611{
1612 struct ata_host *host = dev_get_drvdata(&pdev->dev);
1613 struct nv_host_priv *hpriv = host->private_data;
1614
1615 ata_pci_remove_one(pdev);
1616 kfree(hpriv);
1617}
1618
1619#ifdef CONFIG_PM 1609#ifdef CONFIG_PM
1620static int nv_pci_device_resume(struct pci_dev *pdev) 1610static int nv_pci_device_resume(struct pci_dev *pdev)
1621{ 1611{