The patch titled
sata_nv: fix fallout of devres conversion
has been removed from the -mm tree. Its filename was
sata_nv-fix-fallout-of-devres-conversion.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: sata_nv: fix fallout of devres conversion
From: Tejun Heo <htejun@xxxxxxxxx>
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@xxxxxxxxx>
Cc: Peer Chen <pchen@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/ata/sata_nv.c | 12 +-----------
1 files changed, 1 insertion(+), 11 deletions(-)
diff -puN drivers/ata/sata_nv.c~sata_nv-fix-fallout-of-devres-conversion drivers/ata/sata_nv.c
--- a/drivers/ata/sata_nv.c~sata_nv-fix-fallout-of-devres-conversion
+++ a/drivers/ata/sata_nv.c
@@ -229,7 +229,6 @@ struct nv_host_priv {
#define NV_ADMA_CHECK_INTR(GCTL, PORT) ((GCTL) & ( 1 << (19 + (12 * (PORT)))))
static int nv_init_one (struct pci_dev *pdev, const struct pci_device_id *ent);
-static void nv_remove_one (struct pci_dev *pdev);
#ifdef CONFIG_PM
static int nv_pci_device_resume(struct pci_dev *pdev);
#endif
@@ -300,7 +299,7 @@ static struct pci_driver nv_pci_driver =
.suspend = ata_pci_device_suspend,
.resume = nv_pci_device_resume,
#endif
- .remove = nv_remove_one,
+ .remove = ata_pci_remove_one,
};
static struct scsi_host_template nv_sht = {
@@ -1607,15 +1606,6 @@ static int nv_init_one (struct pci_dev *
IRQF_SHARED, ppi[0]->sht);
}
-static void nv_remove_one (struct pci_dev *pdev)
-{
- struct ata_host *host = dev_get_drvdata(&pdev->dev);
- struct nv_host_priv *hpriv = host->private_data;
-
- ata_pci_remove_one(pdev);
- kfree(hpriv);
-}
-
#ifdef CONFIG_PM
static int nv_pci_device_resume(struct pci_dev *pdev)
{
_
Patches currently in -mm which might be from htejun@xxxxxxxxx are
origin.patch
fix-gregkh-driver-sysfs-fix-error-handling-in-binattr-write.patch
pata_acpi-restore-driver-vs-libata-clean-up-sff-init-mess-fix.patch
optional-led-trigger-for-libata.patch
libata-add-support-for-ata_16-on-atapi.patch
fix-build-failure-for-drivers-ata-pata_sccc.patch
libata-implement-ata_wait_after_reset.patch
drivers-ata-add-sw-ncq-support-to-sata_nv-for-mcp51-mcp55-mcp61.patch
drivers-ata-add-sw-ncq-support-to-sata_nv-for-mcp51-mcp55-mcp61-fix.patch
drivers-ata-add-sw-ncq-support-to-sata_nv-for-mcp51-mcp55-mcp61-fix-tidy.patch
pci-quirks-disable-msi-on-rs400-200-and-rs480.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
