sata_nv: fix fallout of devres conversion

As with all other drivers, sata_nv's hpriv is allocated with
devm_kzalloc() and there's no need to free it explicitly. Kill
nv_remove_one() which incorrectly used kfree() instead of devm_kfree()
and use ata_pci_remove_one() directly.

Original fix is from Peer Chen.

Signed-off-by: Tejun Heo <htejun@gmail.com>
Cc: Peer Chen <pchen@nvidia.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>

authored by Tejun Heo and committed by Jeff Garzik 1daf9ce7 074b8ba3

+1 -11
+1 -11
drivers/ata/sata_nv.c
··· 229 229 #define NV_ADMA_CHECK_INTR(GCTL, PORT) ((GCTL) & ( 1 << (19 + (12 * (PORT))))) 230 230 231 231 static int nv_init_one (struct pci_dev *pdev, const struct pci_device_id *ent); 232 - static void nv_remove_one (struct pci_dev *pdev); 233 232 #ifdef CONFIG_PM 234 233 static int nv_pci_device_resume(struct pci_dev *pdev); 235 234 #endif ··· 299 300 .suspend = ata_pci_device_suspend, 300 301 .resume = nv_pci_device_resume, 301 302 #endif 302 - .remove = nv_remove_one, 303 + .remove = ata_pci_remove_one, 303 304 }; 304 305 305 306 static struct scsi_host_template nv_sht = { ··· 1604 1605 pci_set_master(pdev); 1605 1606 return ata_host_activate(host, pdev->irq, ppi[0]->irq_handler, 1606 1607 IRQF_SHARED, ppi[0]->sht); 1607 - } 1608 - 1609 - static void nv_remove_one (struct pci_dev *pdev) 1610 - { 1611 - struct ata_host *host = dev_get_drvdata(&pdev->dev); 1612 - struct nv_host_priv *hpriv = host->private_data; 1613 - 1614 - ata_pci_remove_one(pdev); 1615 - kfree(hpriv); 1616 1608 } 1617 1609 1618 1610 #ifdef CONFIG_PM