diff options
author | Len Brown <len.brown@intel.com> | 2007-08-23 15:20:26 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2007-08-23 15:20:26 -0400 |
commit | 14e04fb34ffa82ee61ae69f98d8fca12d2e8e31c (patch) | |
tree | 51ff919052cf456a23fa67e8d64d18f376b90582 /drivers/acpi/thermal.c | |
parent | 962ce8ca0604af0c3c5609f7613d4ec5fcfac623 (diff) |
ACPI: Schedule /proc/acpi/event for removal
Schedule /proc/acpi/event for removal in 6 months.
Re-name acpi_bus_generate_event() to acpi_bus_generate_proc_event()
to make sure there is no confusion that it is for /proc/acpi/event only.
Add CONFIG_ACPI_PROC_EVENT to allow removal of /proc/acpi/event.
There is no functional change if CONFIG_ACPI_PROC_EVENT=y
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/thermal.c')
-rw-r--r-- | drivers/acpi/thermal.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c index 291758c9a4d6..2c9cfe297f73 100644 --- a/drivers/acpi/thermal.c +++ b/drivers/acpi/thermal.c | |||
@@ -485,7 +485,7 @@ static int acpi_thermal_critical(struct acpi_thermal *tz) | |||
485 | printk(KERN_EMERG | 485 | printk(KERN_EMERG |
486 | "Critical temperature reached (%ld C), shutting down.\n", | 486 | "Critical temperature reached (%ld C), shutting down.\n", |
487 | KELVIN_TO_CELSIUS(tz->temperature)); | 487 | KELVIN_TO_CELSIUS(tz->temperature)); |
488 | acpi_bus_generate_event(tz->device, ACPI_THERMAL_NOTIFY_CRITICAL, | 488 | acpi_bus_generate_proc_event(tz->device, ACPI_THERMAL_NOTIFY_CRITICAL, |
489 | tz->trips.critical.flags.enabled); | 489 | tz->trips.critical.flags.enabled); |
490 | acpi_bus_generate_netlink_event(tz->device->pnp.device_class, | 490 | acpi_bus_generate_netlink_event(tz->device->pnp.device_class, |
491 | tz->device->dev.bus_id, | 491 | tz->device->dev.bus_id, |
@@ -508,7 +508,7 @@ static int acpi_thermal_hot(struct acpi_thermal *tz) | |||
508 | } else if (tz->trips.hot.flags.enabled) | 508 | } else if (tz->trips.hot.flags.enabled) |
509 | tz->trips.hot.flags.enabled = 0; | 509 | tz->trips.hot.flags.enabled = 0; |
510 | 510 | ||
511 | acpi_bus_generate_event(tz->device, ACPI_THERMAL_NOTIFY_HOT, | 511 | acpi_bus_generate_proc_event(tz->device, ACPI_THERMAL_NOTIFY_HOT, |
512 | tz->trips.hot.flags.enabled); | 512 | tz->trips.hot.flags.enabled); |
513 | acpi_bus_generate_netlink_event(tz->device->pnp.device_class, | 513 | acpi_bus_generate_netlink_event(tz->device->pnp.device_class, |
514 | tz->device->dev.bus_id, | 514 | tz->device->dev.bus_id, |
@@ -1157,14 +1157,14 @@ static void acpi_thermal_notify(acpi_handle handle, u32 event, void *data) | |||
1157 | case ACPI_THERMAL_NOTIFY_THRESHOLDS: | 1157 | case ACPI_THERMAL_NOTIFY_THRESHOLDS: |
1158 | acpi_thermal_get_trip_points(tz); | 1158 | acpi_thermal_get_trip_points(tz); |
1159 | acpi_thermal_check(tz); | 1159 | acpi_thermal_check(tz); |
1160 | acpi_bus_generate_event(device, event, 0); | 1160 | acpi_bus_generate_proc_event(device, event, 0); |
1161 | acpi_bus_generate_netlink_event(device->pnp.device_class, | 1161 | acpi_bus_generate_netlink_event(device->pnp.device_class, |
1162 | device->dev.bus_id, event, 0); | 1162 | device->dev.bus_id, event, 0); |
1163 | break; | 1163 | break; |
1164 | case ACPI_THERMAL_NOTIFY_DEVICES: | 1164 | case ACPI_THERMAL_NOTIFY_DEVICES: |
1165 | if (tz->flags.devices) | 1165 | if (tz->flags.devices) |
1166 | acpi_thermal_get_devices(tz); | 1166 | acpi_thermal_get_devices(tz); |
1167 | acpi_bus_generate_event(device, event, 0); | 1167 | acpi_bus_generate_proc_event(device, event, 0); |
1168 | acpi_bus_generate_netlink_event(device->pnp.device_class, | 1168 | acpi_bus_generate_netlink_event(device->pnp.device_class, |
1169 | device->dev.bus_id, event, 0); | 1169 | device->dev.bus_id, event, 0); |
1170 | break; | 1170 | break; |