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

thermal: intel: int340x: Assorted minor cleanups 



Improve some inconsistent usage of white space in int340x_thermal_zone.c,
fix up one coding style issue in it (missing braces around an else
branch of a conditional) and while at it replace a !ACPI_FAILURE()
check with an equivalent ACPI_SUCCESS() one.

No intentional functional impact.

Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
Tested-by: default avatarZhang Rui <rui.zhang@intel.com>
Reviewed-by: default avatarZhang Rui <rui.zhang@intel.com>
parent dd3b3d16

drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c

+7 −9
Original line number Diff line number Diff line
@@ -30,9 +30,10 @@ static int int340x_thermal_get_zone_temp(struct thermal_zone_device *zone, 
			return conv_temp;



		*temp = (unsigned long)conv_temp * 10;

	} else

	} else {

		/* _TMP returns the temperature in tenths of degrees Kelvin */

		*temp = deci_kelvin_to_millicelsius(tmp);

	}



	return 0;

}
@@ -92,7 +93,6 @@ static int int340x_thermal_read_trips(struct acpi_device *zone_adev, 
	}



	for (i = 0; i < INT340X_THERMAL_MAX_ACT_TRIP_COUNT; i++) {



		ret = thermal_acpi_active_trip_temp(zone_adev, i,

						    &zone_trips[trip_cnt].temperature);

		if (ret)
@@ -121,8 +121,7 @@ struct int34x_thermal_zone *int340x_thermal_zone_add(struct acpi_device *adev, 
	acpi_status status;

	int i, ret;



	int34x_thermal_zone = kzalloc(sizeof(*int34x_thermal_zone),

				      GFP_KERNEL);

	int34x_thermal_zone = kzalloc(sizeof(*int34x_thermal_zone), GFP_KERNEL);

	if (!int34x_thermal_zone)

		return ERR_PTR(-ENOMEM);
@@ -139,7 +138,7 @@ struct int34x_thermal_zone *int340x_thermal_zone_add(struct acpi_device *adev, 
		int34x_thermal_zone->ops->get_temp = get_temp;



	status = acpi_evaluate_integer(adev->handle, "PATC", NULL, &trip_cnt);

	if (!ACPI_FAILURE(status)) {

	if (ACPI_SUCCESS(status)) {

		int34x_thermal_zone->aux_trip_nr = trip_cnt;

		trip_mask = BIT(trip_cnt) - 1;

	}
@@ -169,8 +168,7 @@ struct int34x_thermal_zone *int340x_thermal_zone_add(struct acpi_device *adev, 


	int34x_thermal_zone->trips = zone_trips;



	int34x_thermal_zone->lpat_table = acpi_lpat_get_conversion_table(

								adev->handle);

	int34x_thermal_zone->lpat_table = acpi_lpat_get_conversion_table(adev->handle);



	int34x_thermal_zone->zone = thermal_zone_device_register_with_trips(

						acpi_device_bid(adev),