]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
ata: ahci_platform: convert kcalloc to devm_kcalloc
authorCorentin Labbe <clabbe@baylibre.com>
Thu, 12 Jul 2018 11:41:31 +0000 (11:41 +0000)
committerTejun Heo <tj@kernel.org>
Thu, 12 Jul 2018 20:02:39 +0000 (13:02 -0700)
Like phys, target_pwrs could be allocated with devm_ function

Signed-off-by: Corentin Labbe <clabbe@baylibre.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
drivers/ata/libahci_platform.c

index be9f54423a9baf75c09bb30a90285836f2bc4a3d..fe8939e161ea799ceb3232e67889fa7e5f409610 100644 (file)
@@ -271,8 +271,6 @@ static void ahci_platform_put_resources(struct device *dev, void *res)
        for (c = 0; c < hpriv->nports; c++)
                if (hpriv->target_pwrs && hpriv->target_pwrs[c])
                        regulator_put(hpriv->target_pwrs[c]);
-
-       kfree(hpriv->target_pwrs);
 }
 
 static int ahci_platform_get_phy(struct ahci_host_priv *hpriv, u32 port,
@@ -408,7 +406,7 @@ struct ahci_host_priv *ahci_platform_get_resources(struct platform_device *pdev)
                rc = -ENOMEM;
                goto err_out;
        }
-       hpriv->target_pwrs = kcalloc(hpriv->nports, sizeof(*hpriv->target_pwrs), GFP_KERNEL);
+       hpriv->target_pwrs = devm_kcalloc(dev, hpriv->nports, sizeof(*hpriv->target_pwrs), GFP_KERNEL);
        if (!hpriv->target_pwrs) {
                rc = -ENOMEM;
                goto err_out;