From: Rafael J. Wysocki <[email protected]>
Rename local variable int34x_thermal_zone in int340x_thermal_zone_add()
to int34x_zone which allows a number of code lines to become shorter and
easier to read and adjust some white space for consistency.
No intentional functional impact.
Signed-off-by: Rafael J. Wysocki <[email protected]>
---
drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c | 69 +++++------
1 file changed, 34 insertions(+), 35 deletions(-)
Index: linux-pm/drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c
===================================================================
--- linux-pm.orig/drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c
+++ linux-pm/drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c
@@ -118,82 +118,81 @@ static struct thermal_zone_params int340
struct int34x_thermal_zone *int340x_thermal_zone_add(struct acpi_device *adev,
int (*get_temp) (struct thermal_zone_device *, int *))
{
- struct int34x_thermal_zone *int34x_thermal_zone;
+ struct int34x_thermal_zone *int34x_zone;
unsigned long long trip_cnt = 0;
int trip_mask = 0;
acpi_status status;
int i, ret;
- int34x_thermal_zone = kzalloc(sizeof(*int34x_thermal_zone), GFP_KERNEL);
- if (!int34x_thermal_zone)
+ int34x_zone = kzalloc(sizeof(*int34x_zone), GFP_KERNEL);
+ if (!int34x_zone)
return ERR_PTR(-ENOMEM);
- int34x_thermal_zone->adev = adev;
+ int34x_zone->adev = adev;
- int34x_thermal_zone->ops = kmemdup(&int340x_thermal_zone_ops,
- sizeof(int340x_thermal_zone_ops), GFP_KERNEL);
- if (!int34x_thermal_zone->ops) {
+ int34x_zone->ops = kmemdup(&int340x_thermal_zone_ops,
+ sizeof(int340x_thermal_zone_ops), GFP_KERNEL);
+ if (!int34x_zone->ops) {
ret = -ENOMEM;
goto err_ops_alloc;
}
if (get_temp)
- int34x_thermal_zone->ops->get_temp = get_temp;
+ int34x_zone->ops->get_temp = get_temp;
status = acpi_evaluate_integer(adev->handle, "PATC", NULL, &trip_cnt);
if (ACPI_SUCCESS(status)) {
- int34x_thermal_zone->aux_trip_nr = trip_cnt;
+ int34x_zone->aux_trip_nr = trip_cnt;
trip_mask = BIT(trip_cnt) - 1;
}
trip_cnt += INT340X_THERMAL_MAX_TRIP_COUNT;
- int34x_thermal_zone->trips = kzalloc(sizeof(*int34x_thermal_zone->trips) * trip_cnt,
- GFP_KERNEL);
- if (!int34x_thermal_zone->trips) {
+ int34x_zone->trips = kzalloc(sizeof(*int34x_zone->trips) * trip_cnt, GFP_KERNEL);
+ if (!int34x_zone->trips) {
ret = -ENOMEM;
goto err_trips_alloc;
}
- trip_cnt = int340x_thermal_read_trips(int34x_thermal_zone);
+ trip_cnt = int340x_thermal_read_trips(int34x_zone);
for (i = 0; i < trip_cnt; ++i)
- int340x_thermal_get_global_hyst(adev, &int34x_thermal_zone->trips[i].hysteresis);
+ int340x_thermal_get_global_hyst(adev, &int34x_zone->trips[i].hysteresis);
- for (i = 0; i < int34x_thermal_zone->aux_trip_nr; i++) {
- int34x_thermal_zone->trips[i].type = THERMAL_TRIP_PASSIVE;
- int34x_thermal_zone->trips[i].temperature = THERMAL_TEMP_INVALID;
+ for (i = 0; i < int34x_zone->aux_trip_nr; i++) {
+ int34x_zone->trips[i].type = THERMAL_TRIP_PASSIVE;
+ int34x_zone->trips[i].temperature = THERMAL_TEMP_INVALID;
}
- int34x_thermal_zone->lpat_table = acpi_lpat_get_conversion_table(adev->handle);
+ int34x_zone->lpat_table = acpi_lpat_get_conversion_table(adev->handle);
- int34x_thermal_zone->zone = thermal_zone_device_register_with_trips(
- acpi_device_bid(adev),
- int34x_thermal_zone->trips,
- trip_cnt,
- trip_mask, int34x_thermal_zone,
- int34x_thermal_zone->ops,
- &int340x_thermal_params,
- 0, 0);
- if (IS_ERR(int34x_thermal_zone->zone)) {
- ret = PTR_ERR(int34x_thermal_zone->zone);
+ int34x_zone->zone = thermal_zone_device_register_with_trips(
+ acpi_device_bid(adev),
+ int34x_zone->trips,
+ trip_cnt,
+ trip_mask, int34x_zone,
+ int34x_zone->ops,
+ &int340x_thermal_params,
+ 0, 0);
+ if (IS_ERR(int34x_zone->zone)) {
+ ret = PTR_ERR(int34x_zone->zone);
goto err_thermal_zone;
}
- ret = thermal_zone_device_enable(int34x_thermal_zone->zone);
+ ret = thermal_zone_device_enable(int34x_zone->zone);
if (ret)
goto err_enable;
- return int34x_thermal_zone;
+ return int34x_zone;
err_enable:
- thermal_zone_device_unregister(int34x_thermal_zone->zone);
+ thermal_zone_device_unregister(int34x_zone->zone);
err_thermal_zone:
- kfree(int34x_thermal_zone->trips);
- acpi_lpat_free_conversion_table(int34x_thermal_zone->lpat_table);
+ kfree(int34x_zone->trips);
+ acpi_lpat_free_conversion_table(int34x_zone->lpat_table);
err_trips_alloc:
- kfree(int34x_thermal_zone->ops);
+ kfree(int34x_zone->ops);
err_ops_alloc:
- kfree(int34x_thermal_zone);
+ kfree(int34x_zone);
return ERR_PTR(ret);
}
EXPORT_SYMBOL_GPL(int340x_thermal_zone_add);