Skip to content

Commit a809560

Browse files
committed
ACPI: thermal: Drop redundant ACPI_TRIPS_REFRESH_DEVICES symbol
Drop the ACPI_TRIPS_REFRESH_DEVICES symbol which is redundant, because ACPI_TRIPS_DEVICES can be used directly instead of it without any drawbacks and rename the ACPI_TRIPS_REFRESH_THRESHOLDS to ACPI_TRIPS_THRESHOLDS to make the code a bit more consistent. While at it, fix up some formatting white space used in the symbol definitions. No functional impact. Signed-off-by: Rafael J. Wysocki <[email protected]> Reviewed-by: Michal Wilczynski <[email protected]> Reviewed-by: Daniel Lezcano <[email protected]>
1 parent 3883fe9 commit a809560

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

drivers/acpi/thermal.c

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -238,12 +238,11 @@ static int acpi_thermal_set_cooling_mode(struct acpi_thermal *tz, int mode)
238238
#define ACPI_TRIPS_ACTIVE BIT(3)
239239
#define ACPI_TRIPS_DEVICES BIT(4)
240240

241-
#define ACPI_TRIPS_REFRESH_THRESHOLDS (ACPI_TRIPS_PASSIVE | ACPI_TRIPS_ACTIVE)
242-
#define ACPI_TRIPS_REFRESH_DEVICES ACPI_TRIPS_DEVICES
241+
#define ACPI_TRIPS_THRESHOLDS (ACPI_TRIPS_PASSIVE | ACPI_TRIPS_ACTIVE)
243242

244-
#define ACPI_TRIPS_INIT (ACPI_TRIPS_CRITICAL | ACPI_TRIPS_HOT | \
245-
ACPI_TRIPS_PASSIVE | ACPI_TRIPS_ACTIVE | \
246-
ACPI_TRIPS_DEVICES)
243+
#define ACPI_TRIPS_INIT (ACPI_TRIPS_CRITICAL | ACPI_TRIPS_HOT | \
244+
ACPI_TRIPS_PASSIVE | ACPI_TRIPS_ACTIVE | \
245+
ACPI_TRIPS_DEVICES)
247246

248247
/*
249248
* This exception is thrown out in two cases:
@@ -906,13 +905,13 @@ static void acpi_thermal_notify(struct acpi_device *device, u32 event)
906905
acpi_queue_thermal_check(tz);
907906
break;
908907
case ACPI_THERMAL_NOTIFY_THRESHOLDS:
909-
acpi_thermal_trips_update(tz, ACPI_TRIPS_REFRESH_THRESHOLDS);
908+
acpi_thermal_trips_update(tz, ACPI_TRIPS_THRESHOLDS);
910909
acpi_queue_thermal_check(tz);
911910
acpi_bus_generate_netlink_event(device->pnp.device_class,
912911
dev_name(&device->dev), event, 0);
913912
break;
914913
case ACPI_THERMAL_NOTIFY_DEVICES:
915-
acpi_thermal_trips_update(tz, ACPI_TRIPS_REFRESH_DEVICES);
914+
acpi_thermal_trips_update(tz, ACPI_TRIPS_DEVICES);
916915
acpi_queue_thermal_check(tz);
917916
acpi_bus_generate_netlink_event(device->pnp.device_class,
918917
dev_name(&device->dev), event, 0);

0 commit comments

Comments
 (0)