lkml.org 
[lkml]   [2007]   [May]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH] 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>
    ---

    I think it's prettier this way. :-)

    diff --git a/drivers/ata/sata_nv.c b/drivers/ata/sata_nv.c
    index 4cea3ef..5be4e28 100644
    --- a/drivers/ata/sata_nv.c
    +++ b/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
    @@ -306,7 +305,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 = {
    @@ -1613,15 +1612,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)
    {
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/
    \
     
     \ /
      Last update: 2007-05-17 13:17    [W:0.027 / U:0.004 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site