compal-laptop: Use devm_kzalloc to allocate local data structure

Reduce code size and simplify error path.

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>

diff --git a/drivers/platform/x86/compal-laptop.c b/drivers/platform/x86/compal-laptop.c
index eaa78edb1f4ef2b9f5af80bd0f715dfaa9304bd8..7155d79d6b3a71ef7a4bfd3250bb5d69e3fecc70 100644 (file)
--- 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;