From cf508f4496f7dc7c162a8ac4440165d466f68d4b Mon Sep 17 00:00:00 2001 From: Guenter Roeck Date: Sat, 23 Nov 2013 11:03:19 -0800 Subject: [PATCH] compal-laptop: Use devm_kzalloc to allocate local data structure Reduce code size and simplify error path. Signed-off-by: Guenter Roeck Signed-off-by: Matthew Garrett --- drivers/platform/x86/compal-laptop.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/drivers/platform/x86/compal-laptop.c b/drivers/platform/x86/compal-laptop.c index eaa78ed..7155d79 100644 --- a/drivers/platform/x86/compal-laptop.c +++ b/drivers/platform/x86/compal-laptop.c @@ -1026,24 +1026,21 @@ static int compal_probe(struct platform_device *pdev) return 0; /* Fan control */ - data = kzalloc(sizeof(struct compal_data), GFP_KERNEL); + data = devm_kzalloc(&pdev->dev, sizeof(struct compal_data), GFP_KERNEL); if (!data) return -ENOMEM; initialize_fan_control_data(data); err = sysfs_create_group(&pdev->dev.kobj, &compal_attribute_group); - if (err) { - kfree(data); + if (err) return err; - } data->hwmon_dev = hwmon_device_register(&pdev->dev); if (IS_ERR(data->hwmon_dev)) { err = PTR_ERR(data->hwmon_dev); sysfs_remove_group(&pdev->dev.kobj, &compal_attribute_group); - kfree(data); return err; } @@ -1083,8 +1080,6 @@ static int compal_remove(struct platform_device *pdev) hwmon_device_unregister(data->hwmon_dev); power_supply_unregister(&data->psy); - kfree(data); - sysfs_remove_group(&pdev->dev.kobj, &compal_attribute_group); return 0; -- 2.7.4