mfd: davinci_voicecodec: Convert to managed resources for allocating memory

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>

diff --git a/drivers/mfd/davinci_voicecodec.c b/drivers/mfd/davinci_voicecodec.c
index c60ab0c3c4db3318e398487a9988e0f8b0eb5949..b6e297363946a5b0afc0e2b6a529443b4840b0ee 100644 (file)
--- a/drivers/mfd/davinci_voicecodec.c
+++ b/drivers/mfd/davinci_voicecodec.c
@@ -50,7 +50,8 @@ static int __init davinci_vc_probe(struct platform_device *pdev)
        struct mfd_cell *cell = NULL;
        int ret;
 
-       davinci_vc = kzalloc(sizeof(struct davinci_vc), GFP_KERNEL);
+       davinci_vc = devm_kzalloc(&pdev->dev,
+                                 sizeof(struct davinci_vc), GFP_KERNEL);
        if (!davinci_vc) {
                dev_dbg(&pdev->dev,
                            "could not allocate memory for private data\n");
@@ -61,8 +62,7 @@ static int __init davinci_vc_probe(struct platform_device *pdev)
        if (IS_ERR(davinci_vc->clk)) {
                dev_dbg(&pdev->dev,
                            "could not get the clock for voice codec\n");
-               ret = -ENODEV;
-               goto fail1;
+               return -ENODEV;
        }
        clk_enable(davinci_vc->clk);
 
@@ -145,8 +145,6 @@ fail2:
        clk_disable(davinci_vc->clk);
        clk_put(davinci_vc->clk);
        davinci_vc->clk = NULL;
-fail1:
-       kfree(davinci_vc);
 
        return ret;
 }
@@ -164,8 +162,6 @@ static int davinci_vc_remove(struct platform_device *pdev)
        clk_put(davinci_vc->clk);
        davinci_vc->clk = NULL;
 
-       kfree(davinci_vc);
-
        return 0;
 }