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

Commit 308f726a authored by Eduardo Valentin's avatar Eduardo Valentin Committed by Zhang Rui
Browse files

thermal: core: group device_create_file() calls that are always created 



Simple code reorganization to group files that are always created
when registering a thermal zone.

Cc: Zhang Rui <rui.zhang@intel.com>
Cc: linux-pm@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: default avatarEduardo Valentin <edubezval@gmail.com>
Signed-off-by: default avatarZhang Rui <rui.zhang@intel.com>
parent ef1d8bff

drivers/thermal/thermal_core.c

+12 −12
Original line number Diff line number Diff line
@@ -1921,14 +1921,6 @@ struct thermal_zone_device *thermal_zone_device_register(const char *type, 
	}



	/* sys I/F */

	result = device_create_file(&tz->device, &dev_attr_type);

	if (result)

		goto unregister;



	result = device_create_file(&tz->device, &dev_attr_temp);

	if (result)

		goto unregister;



	if (ops->get_mode) {

		result = device_create_file(&tz->device, &dev_attr_mode);

		if (result)
@@ -1963,13 +1955,16 @@ struct thermal_zone_device *thermal_zone_device_register(const char *type, 
			goto unregister;

	}



	/* Create policy attribute */

	result = device_create_file(&tz->device, &dev_attr_policy);

	result = device_create_file(&tz->device, &dev_attr_type);

	if (result)

		goto unregister;



	/* Add thermal zone params */

	result = create_tzp_attrs(&tz->device);

	result = device_create_file(&tz->device, &dev_attr_temp);

	if (result)

		goto unregister;



	/* Create policy attribute */

	result = device_create_file(&tz->device, &dev_attr_policy);

	if (result)

		goto unregister;
@@ -1978,6 +1973,11 @@ struct thermal_zone_device *thermal_zone_device_register(const char *type, 
	if (result)

		goto unregister;



	/* Add thermal zone params */

	result = create_tzp_attrs(&tz->device);

	if (result)

		goto unregister;



	/* Update 'this' zone's governor information */

	mutex_lock(&thermal_governor_lock);