drivers/video/backlight/lm3533_bl.c: use devm_ functions
The devm_ functions allocate memory that is released when a driver detaches. This patch uses devm_kzalloc of these functions. Signed-off-by: Jingoo Han <jg1.han@samsung.com> Acked-by: Johan Hovold <jhovold@gmail.com> Cc: Richard Purdie <rpurdie@rpsys.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
f1b60d46b6
commit
b4a74615a4
|
@ -295,7 +295,7 @@ static int __devinit lm3533_bl_probe(struct platform_device *pdev)
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
}
|
}
|
||||||
|
|
||||||
bl = kzalloc(sizeof(*bl), GFP_KERNEL);
|
bl = devm_kzalloc(&pdev->dev, sizeof(*bl), GFP_KERNEL);
|
||||||
if (!bl) {
|
if (!bl) {
|
||||||
dev_err(&pdev->dev,
|
dev_err(&pdev->dev,
|
||||||
"failed to allocate memory for backlight\n");
|
"failed to allocate memory for backlight\n");
|
||||||
|
@ -317,8 +317,7 @@ static int __devinit lm3533_bl_probe(struct platform_device *pdev)
|
||||||
&lm3533_bl_ops, &props);
|
&lm3533_bl_ops, &props);
|
||||||
if (IS_ERR(bd)) {
|
if (IS_ERR(bd)) {
|
||||||
dev_err(&pdev->dev, "failed to register backlight device\n");
|
dev_err(&pdev->dev, "failed to register backlight device\n");
|
||||||
ret = PTR_ERR(bd);
|
return PTR_ERR(bd);
|
||||||
goto err_free;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
bl->bd = bd;
|
bl->bd = bd;
|
||||||
|
@ -348,8 +347,6 @@ err_sysfs_remove:
|
||||||
sysfs_remove_group(&bd->dev.kobj, &lm3533_bl_attribute_group);
|
sysfs_remove_group(&bd->dev.kobj, &lm3533_bl_attribute_group);
|
||||||
err_unregister:
|
err_unregister:
|
||||||
backlight_device_unregister(bd);
|
backlight_device_unregister(bd);
|
||||||
err_free:
|
|
||||||
kfree(bl);
|
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
@ -367,7 +364,6 @@ static int __devexit lm3533_bl_remove(struct platform_device *pdev)
|
||||||
lm3533_ctrlbank_disable(&bl->cb);
|
lm3533_ctrlbank_disable(&bl->cb);
|
||||||
sysfs_remove_group(&bd->dev.kobj, &lm3533_bl_attribute_group);
|
sysfs_remove_group(&bd->dev.kobj, &lm3533_bl_attribute_group);
|
||||||
backlight_device_unregister(bd);
|
backlight_device_unregister(bd);
|
||||||
kfree(bl);
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue