Commit b3facd7b authored by Himangi Saraogi's avatar Himangi Saraogi Committed by Matthew Garrett
Browse files

ideapad_laptop: 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 label sysfs_failed is removed as it is no longer
required.  Also, linux/device.h is added to make sure the devm_*()
routine declarations are unambiguously available.

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

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

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

@rem depends on prb@
identifier platform.removefn;
expression e;
removefn(...) {
- kfree(e);
Signed-off-by: default avatarHimangi Saraogi <>
Acked-by: default avatarJulia Lawall <>
Signed-off-by: default avatarMatthew Garrett <>
parent b02fdfcc
......@@ -37,6 +37,7 @@
#include <linux/seq_file.h>
#include <linux/i8042.h>
#include <linux/dmi.h>
#include <linux/device.h>
......@@ -847,7 +848,7 @@ static int ideapad_acpi_add(struct platform_device *pdev)
if (read_method_int(adev->handle, "_CFG", &cfg))
return -ENODEV;
priv = kzalloc(sizeof(*priv), GFP_KERNEL);
priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL);
if (!priv)
return -ENOMEM;
......@@ -858,7 +859,7 @@ static int ideapad_acpi_add(struct platform_device *pdev)
ret = ideapad_sysfs_init(priv);
if (ret)
goto sysfs_failed;
return ret;
ret = ideapad_debugfs_init(priv);
if (ret)
......@@ -897,8 +898,6 @@ input_failed:
return ret;
......@@ -916,7 +915,6 @@ static int ideapad_acpi_remove(struct platform_device *pdev)
dev_set_drvdata(&pdev->dev, NULL);
return 0;
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment