Commit b09872a6 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

ACPI: thermal: Fold acpi_thermal_get_info() into its caller 



There is only one caller of acpi_thermal_get_info() and the code from
it can be folded into its caller just fine, so do that.

No intentional functional impact.

Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
parent 4be32333

drivers/acpi/thermal.c

+19 −33
Original line number Diff line number Diff line
@@ -846,38 +846,6 @@ static void acpi_thermal_aml_dependency_fix(struct acpi_thermal *tz) 
	acpi_evaluate_integer(handle, "_TMP", NULL, &value);

}



static int acpi_thermal_get_info(struct acpi_thermal *tz)

{

	int result;



	if (!tz)

		return -EINVAL;



	acpi_thermal_aml_dependency_fix(tz);



	/* Get trip points [_CRT, _PSV, etc.] (required) */

	result = acpi_thermal_get_trip_points(tz);

	if (result)

		return result;



	/* Get temperature [_TMP] (required) */

	result = acpi_thermal_get_temperature(tz);

	if (result)

		return result;



	/* Set the cooling mode [_SCP] to active cooling (default) */

	acpi_execute_simple_method(tz->device->handle, "_SCP",

				   ACPI_THERMAL_MODE_ACTIVE);



	/* Get default polling frequency [_TZP] (optional) */

	if (tzp)

		tz->polling_frequency = tzp;

	else

		acpi_thermal_get_polling_frequency(tz);



	return 0;

}



/*

 * The exact offset between Kelvin and degree Celsius is 273.15. However ACPI

 * handles temperature values with a single decimal place. As a consequence,
@@ -940,10 +908,28 @@ static int acpi_thermal_add(struct acpi_device *device) 
	strcpy(acpi_device_class(device), ACPI_THERMAL_CLASS);

	device->driver_data = tz;



	result = acpi_thermal_get_info(tz);

	acpi_thermal_aml_dependency_fix(tz);



	/* Get trip points [_CRT, _PSV, etc.] (required). */

	result = acpi_thermal_get_trip_points(tz);

	if (result)

		goto free_memory;



	/* Get temperature [_TMP] (required). */

	result = acpi_thermal_get_temperature(tz);

	if (result)

		goto free_memory;



	/* Set the cooling mode [_SCP] to active cooling. */

	acpi_execute_simple_method(tz->device->handle, "_SCP",

				   ACPI_THERMAL_MODE_ACTIVE);



	/* Determine the default polling frequency [_TZP]. */

	if (tzp)

		tz->polling_frequency = tzp;

	else

		acpi_thermal_get_polling_frequency(tz);



	acpi_thermal_guess_offset(tz);



	result = acpi_thermal_register_thermal_zone(tz);