summaryrefslogtreecommitdiffstats
path: root/drivers/ata
diff options
context:
space:
mode:
authorCorentin Labbe <clabbe@baylibre.com>2018-07-12 13:41:31 +0200
committerTejun Heo <tj@kernel.org>2018-07-12 22:02:39 +0200
commitbd0038b1b4f499d814d8f33a55b1df5ea6cf3b85 (patch)
tree2e12675f9ac9ec6677d5e4711de88bd71e766d65 /drivers/ata
parentata: ahci_platform: convert kzallloc to kcalloc (diff)
downloadlinux-bd0038b1b4f499d814d8f33a55b1df5ea6cf3b85.tar.xz
linux-bd0038b1b4f499d814d8f33a55b1df5ea6cf3b85.zip
ata: ahci_platform: convert kcalloc to devm_kcalloc
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>
Diffstat (limited to 'drivers/ata')
-rw-r--r--drivers/ata/libahci_platform.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/ata/libahci_platform.c b/drivers/ata/libahci_platform.c
index be9f54423a9b..fe8939e161ea 100644
--- a/drivers/ata/libahci_platform.c
+++ b/drivers/ata/libahci_platform.c
@@ -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;