ix86/mid/thermal: Introduce the use of the managed version of kzalloc

This patch moves data allocated using kzalloc to managed data allocated
using devm_kzalloc and cleans now unnecessary kfrees in probe and remove
functions.

The following Coccinelle semantic patch was used for making the change:

@platform@
identifier p, probefn, removefn;
@@
struct platform_driver p = {
  .probe = probefn,
  .remove = removefn,
};

@prb@
identifier platform.probefn, pdev;
expression e, e1, e2;
@@
probefn(struct platform_device *pdev, ...) {
  <+...
- e = kzalloc(e1, e2)
+ e = devm_kzalloc(&pdev->dev, e1, e2)
  ...
?-kfree(e);
  ...+>
}

@rem depends on prb@
identifier platform.removefn;
expression e;
@@
removefn(...) {
  <...
- kfree(e);
  ...>
}

Signed-off-by: Himangi Saraogi <himangi774@gmail.com>
Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>

diff --git a/drivers/platform/x86/intel_mid_thermal.c b/drivers/platform/x86/intel_mid_thermal.c
index 93fab8b70ce17dd5b0b811c88807f9adee3f67e0..ab7860a21a2258925c9ff4c6b3621dd59bbbcf78 100644 (file)
--- a/drivers/platform/x86/intel_mid_thermal.c
+++ b/drivers/platform/x86/intel_mid_thermal.c
@@ -481,7 +481,8 @@ static int mid_thermal_probe(struct platform_device *pdev)
        int i;
        struct platform_info *pinfo;
 
-       pinfo = kzalloc(sizeof(struct platform_info), GFP_KERNEL);
+       pinfo = devm_kzalloc(&pdev->dev, sizeof(struct platform_info),
+                            GFP_KERNEL);
        if (!pinfo)
                return -ENOMEM;
 
@@ -489,7 +490,6 @@ static int mid_thermal_probe(struct platform_device *pdev)
        ret = mid_initialize_adc(&pdev->dev);
        if (ret) {
                dev_err(&pdev->dev, "ADC init failed");
-               kfree(pinfo);
                return ret;
        }
 
@@ -520,7 +520,6 @@ err:
                thermal_zone_device_unregister(pinfo->tzd[i]);
        }
        configure_adc(0);
-       kfree(pinfo);
        return ret;
 }
 
@@ -541,8 +540,6 @@ static int mid_thermal_remove(struct platform_device *pdev)
                thermal_zone_device_unregister(pinfo->tzd[i]);
        }
 
-       kfree(pinfo);
-
        /* Stop the ADC */
        return configure_adc(0);
 }