Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cf508f44 authored by Guenter Roeck's avatar Guenter Roeck Committed by Matthew Garrett
Browse files

compal-laptop: Use devm_kzalloc to allocate local data structure 



Reduce code size and simplify error path.

Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarMatthew Garrett <matthew.garrett@nebula.com>
parent 7da8fb27

drivers/platform/x86/compal-laptop.c

+2 −7
Original line number Diff line number Diff line
@@ -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;