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/misc/thinkpad_acpi.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/misc/thinkpad_acpi.c')
-rw-r--r-- | drivers/misc/thinkpad_acpi.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/misc/thinkpad_acpi.c b/drivers/misc/thinkpad_acpi.c index d0825a34a7b0..bb8956d0c104 100644 --- a/drivers/misc/thinkpad_acpi.c +++ b/drivers/misc/thinkpad_acpi.c | |||
@@ -1190,10 +1190,10 @@ static void hotkey_notify(struct ibm_struct *ibm, u32 event) | |||
1190 | } | 1190 | } |
1191 | 1191 | ||
1192 | if (sendacpi) | 1192 | if (sendacpi) |
1193 | acpi_bus_generate_event(ibm->acpi->device, event, hkey); | 1193 | acpi_bus_generate_proc_event(ibm->acpi->device, event, hkey); |
1194 | } else { | 1194 | } else { |
1195 | printk(IBM_ERR "unknown hotkey notification event %d\n", event); | 1195 | printk(IBM_ERR "unknown hotkey notification event %d\n", event); |
1196 | acpi_bus_generate_event(ibm->acpi->device, event, 0); | 1196 | acpi_bus_generate_proc_event(ibm->acpi->device, event, 0); |
1197 | } | 1197 | } |
1198 | } | 1198 | } |
1199 | 1199 | ||
@@ -2179,7 +2179,7 @@ static void dock_notify(struct ibm_struct *ibm, u32 event) | |||
2179 | event, _sta(dock_handle)); | 2179 | event, _sta(dock_handle)); |
2180 | data = 0; /* unknown */ | 2180 | data = 0; /* unknown */ |
2181 | } | 2181 | } |
2182 | acpi_bus_generate_event(ibm->acpi->device, event, data); | 2182 | acpi_bus_generate_proc_event(ibm->acpi->device, event, data); |
2183 | acpi_bus_generate_netlink_event(ibm->acpi->device->pnp.device_class, | 2183 | acpi_bus_generate_netlink_event(ibm->acpi->device->pnp.device_class, |
2184 | ibm->acpi->device->dev.bus_id, | 2184 | ibm->acpi->device->dev.bus_id, |
2185 | event, data); | 2185 | event, data); |
@@ -2280,7 +2280,7 @@ static int __init bay_init(struct ibm_init_struct *iibm) | |||
2280 | 2280 | ||
2281 | static void bay_notify(struct ibm_struct *ibm, u32 event) | 2281 | static void bay_notify(struct ibm_struct *ibm, u32 event) |
2282 | { | 2282 | { |
2283 | acpi_bus_generate_event(ibm->acpi->device, event, 0); | 2283 | acpi_bus_generate_proc_event(ibm->acpi->device, event, 0); |
2284 | acpi_bus_generate_netlink_event(ibm->acpi->device->pnp.device_class, | 2284 | acpi_bus_generate_netlink_event(ibm->acpi->device->pnp.device_class, |
2285 | ibm->acpi->device->dev.bus_id, | 2285 | ibm->acpi->device->dev.bus_id, |
2286 | event, 0); | 2286 | event, 0); |