lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Himangi Saraogi
2014-05-25 13:05:45 +05:30
committed by Matthew Garrett
parent eec3b959f5
commit 14627e3612
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/platform/x86/intel_mid_thermal.c
View File

@@ -481,7 +481,8 @@ static int mid_thermal_probe(struct platform_device *pdev)
int i; int i;
struct platform_info *pinfo; 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) if (!pinfo)
return -ENOMEM; return -ENOMEM;
@@ -489,7 +490,6 @@ static int mid_thermal_probe(struct platform_device *pdev)
ret = mid_initialize_adc(&pdev->dev); ret = mid_initialize_adc(&pdev->dev);
if (ret) { if (ret) {
dev_err(&pdev->dev, "ADC init failed"); dev_err(&pdev->dev, "ADC init failed");
kfree(pinfo);
return ret; return ret;
} }
@@ -520,7 +520,6 @@ err:
thermal_zone_device_unregister(pinfo->tzd[i]); thermal_zone_device_unregister(pinfo->tzd[i]);
} }
configure_adc(0); configure_adc(0);
kfree(pinfo);
return ret; return ret;
} }
@@ -541,8 +540,6 @@ static int mid_thermal_remove(struct platform_device *pdev)
thermal_zone_device_unregister(pinfo->tzd[i]); thermal_zone_device_unregister(pinfo->tzd[i]);
} }
kfree(pinfo);
/* Stop the ADC */ /* Stop the ADC */
return configure_adc(0); return configure_adc(0);
} }