leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ACPI: Schedule /proc/acpi/event for removal

Browse Source 
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>
This commit is contained in:
Len Brown 2007-08-23 15:20:26 -04:00
parent 962ce8ca06
commit 14e04fb34f
18 changed files with 64 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Documentation/feature-removal-schedule.txt
View File

@ -197,6 +197,14 @@ Who: Len Brown <len.brown@intel.com>
--------------------------- ---------------------------
What: /proc/acpi/event
When: February 2008
Why: /proc/acpi/event has been replaced by events via the input layer
and netlink since 2.6.23.
Who: Len Brown <len.brown@intel.com>
---------------------------
What: Compaq touchscreen device emulation What: Compaq touchscreen device emulation
When: Oct 2007 When: Oct 2007
Files: drivers/input/tsdev.c Files: drivers/input/tsdev.c

14
drivers/acpi/Kconfig
View File

@ -68,6 +68,20 @@ config ACPI_PROCFS
Say N to delete /proc/acpi/ files that have moved to /sys/ Say N to delete /proc/acpi/ files that have moved to /sys/
config ACPI_PROC_EVENT
bool "Deprecated /proc/acpi/event support"
depends on PROC_FS
---help---
A user-space daemon, acpi, typically read /proc/acpi/event
and handled all ACPI sub-system generated events.
These events are now delivered to user-space via
either the input layer, or as netlink events.
This build option enables the old code for for legacy
user-space implementation. After some time, this will
be moved under CONFIG_ACPI_PROCFS, and then deleted.
config ACPI_AC config ACPI_AC
tristate "AC Adapter" tristate "AC Adapter"
depends on X86 depends on X86

2
drivers/acpi/ac.c
View File

@ -204,7 +204,7 @@ static void acpi_ac_notify(acpi_handle handle, u32 event, void *data)
case ACPI_NOTIFY_BUS_CHECK: case ACPI_NOTIFY_BUS_CHECK:
case ACPI_NOTIFY_DEVICE_CHECK: case ACPI_NOTIFY_DEVICE_CHECK:
acpi_ac_get_state(ac); acpi_ac_get_state(ac);
acpi_bus_generate_event(device, event, (u32) ac->state); acpi_bus_generate_proc_event(device, event, (u32) ac->state);
acpi_bus_generate_netlink_event(device->pnp.device_class, acpi_bus_generate_netlink_event(device->pnp.device_class,
device->dev.bus_id, event, device->dev.bus_id, event,
(u32) ac->state); (u32) ac->state);

2
drivers/acpi/asus_acpi.c
View File

@ -1069,7 +1069,7 @@ static void asus_hotk_notify(acpi_handle handle, u32 event, void *data)
hotk->brightness = (event & ~((u32) BR_DOWN)); hotk->brightness = (event & ~((u32) BR_DOWN));
} }
acpi_bus_generate_event(hotk->device, event, acpi_bus_generate_proc_event(hotk->device, event,
hotk->event_count[event % 128]++); hotk->event_count[event % 128]++);
return; return;

2
drivers/acpi/battery.c
View File

@ -867,7 +867,7 @@ static void acpi_battery_notify(acpi_handle handle, u32 event, void *data)
case ACPI_NOTIFY_DEVICE_CHECK: case ACPI_NOTIFY_DEVICE_CHECK:
device = battery->device; device = battery->device;
acpi_battery_notify_update(battery); acpi_battery_notify_update(battery);
acpi_bus_generate_event(device, event, acpi_bus_generate_proc_event(device, event,
acpi_battery_present(battery)); acpi_battery_present(battery));
acpi_bus_generate_netlink_event(device->pnp.device_class, acpi_bus_generate_netlink_event(device->pnp.device_class,
device->dev.bus_id, event, device->dev.bus_id, event,

6
drivers/acpi/bus.c
View File

@ -276,6 +276,7 @@ EXPORT_SYMBOL(acpi_bus_set_power);
Event Management Event Management
-------------------------------------------------------------------------- */ -------------------------------------------------------------------------- */
#ifdef CONFIG_ACPI_PROC_EVENT
static DEFINE_SPINLOCK(acpi_bus_event_lock); static DEFINE_SPINLOCK(acpi_bus_event_lock);
LIST_HEAD(acpi_bus_event_list); LIST_HEAD(acpi_bus_event_list);
@ -283,7 +284,7 @@ DECLARE_WAIT_QUEUE_HEAD(acpi_bus_event_queue);
extern int event_is_open; extern int event_is_open;
int acpi_bus_generate_event(struct acpi_device *device, u8 type, int data) int acpi_bus_generate_proc_event(struct acpi_device *device, u8 type, int data)
{ {
struct acpi_bus_event *event = NULL; struct acpi_bus_event *event = NULL;
unsigned long flags = 0; unsigned long flags = 0;
@ -314,7 +315,7 @@ int acpi_bus_generate_event(struct acpi_device *device, u8 type, int data)
return 0; return 0;
} }
EXPORT_SYMBOL(acpi_bus_generate_event); EXPORT_SYMBOL(acpi_bus_generate_proc_event);
int acpi_bus_receive_event(struct acpi_bus_event *event) int acpi_bus_receive_event(struct acpi_bus_event *event)
{ {
@ -360,6 +361,7 @@ int acpi_bus_receive_event(struct acpi_bus_event *event)
} }
EXPORT_SYMBOL(acpi_bus_receive_event); EXPORT_SYMBOL(acpi_bus_receive_event);
#endif /* CONFIG_ACPI_PROC_EVENT */
/* -------------------------------------------------------------------------- /* --------------------------------------------------------------------------
Notification Handling Notification Handling

2
drivers/acpi/button.c
View File

@ -284,7 +284,7 @@ static void acpi_button_notify(acpi_handle handle, u32 event, void *data)
} }
input_sync(input); input_sync(input);
acpi_bus_generate_event(button->device, event, acpi_bus_generate_proc_event(button->device, event,
++button->pushed); ++button->pushed);
break; break;
default: default:

6
drivers/acpi/event.c
View File

@ -17,6 +17,7 @@
#define _COMPONENT ACPI_SYSTEM_COMPONENT #define _COMPONENT ACPI_SYSTEM_COMPONENT
ACPI_MODULE_NAME("event"); ACPI_MODULE_NAME("event");
#ifdef CONFIG_ACPI_PROC_EVENT
/* Global vars for handling event proc entry */ /* Global vars for handling event proc entry */
static DEFINE_SPINLOCK(acpi_system_event_lock); static DEFINE_SPINLOCK(acpi_system_event_lock);
int event_is_open = 0; int event_is_open = 0;
@ -106,6 +107,7 @@ static const struct file_operations acpi_system_event_ops = {
.release = acpi_system_close_event, .release = acpi_system_close_event,
.poll = acpi_system_poll_event, .poll = acpi_system_poll_event,
}; };
#endif /* CONFIG_ACPI_PROC_EVENT */
#ifdef CONFIG_NET #ifdef CONFIG_NET
static unsigned int acpi_event_seqnum; static unsigned int acpi_event_seqnum;
@ -247,7 +249,9 @@ static int acpi_event_genetlink_init(void)
static int __init acpi_event_init(void) static int __init acpi_event_init(void)
{ {
#ifdef CONFIG_ACPI_PROC_EVENT
struct proc_dir_entry *entry; struct proc_dir_entry *entry;
#endif
int error = 0; int error = 0;
if (acpi_disabled) if (acpi_disabled)
@ -259,12 +263,14 @@ static int __init acpi_event_init(void)
printk(KERN_WARNING PREFIX printk(KERN_WARNING PREFIX
"Failed to create genetlink family for ACPI event\n"); "Failed to create genetlink family for ACPI event\n");
#ifdef CONFIG_ACPI_PROC_EVENT
/* 'event' [R] */ /* 'event' [R] */
entry = create_proc_entry("event", S_IRUSR, acpi_root_dir); entry = create_proc_entry("event", S_IRUSR, acpi_root_dir);
if (entry) if (entry)
entry->proc_fops = &acpi_system_event_ops; entry->proc_fops = &acpi_system_event_ops;
else else
return -ENODEV; return -ENODEV;
#endif
return 0; return 0;
} }

6
drivers/acpi/processor_core.c
View File

@ -698,7 +698,7 @@ static void acpi_processor_notify(acpi_handle handle, u32 event, void *data)
switch (event) { switch (event) {
case ACPI_PROCESSOR_NOTIFY_PERFORMANCE: case ACPI_PROCESSOR_NOTIFY_PERFORMANCE:
acpi_processor_ppc_has_changed(pr); acpi_processor_ppc_has_changed(pr);
acpi_bus_generate_event(device, event, acpi_bus_generate_proc_event(device, event,
pr->performance_platform_limit); pr->performance_platform_limit);
acpi_bus_generate_netlink_event(device->pnp.device_class, acpi_bus_generate_netlink_event(device->pnp.device_class,
device->dev.bus_id, event, device->dev.bus_id, event,
@ -706,13 +706,13 @@ static void acpi_processor_notify(acpi_handle handle, u32 event, void *data)
break; break;
case ACPI_PROCESSOR_NOTIFY_POWER: case ACPI_PROCESSOR_NOTIFY_POWER:
acpi_processor_cst_has_changed(pr); acpi_processor_cst_has_changed(pr);
acpi_bus_generate_event(device, event, 0); acpi_bus_generate_proc_event(device, event, 0);
acpi_bus_generate_netlink_event(device->pnp.device_class, acpi_bus_generate_netlink_event(device->pnp.device_class,
device->dev.bus_id, event, 0); device->dev.bus_id, event, 0);
break; break;
case ACPI_PROCESSOR_NOTIFY_THROTTLING: case ACPI_PROCESSOR_NOTIFY_THROTTLING:
acpi_processor_tstate_has_changed(pr); acpi_processor_tstate_has_changed(pr);
acpi_bus_generate_event(device, event, 0); acpi_bus_generate_proc_event(device, event, 0);
acpi_bus_generate_netlink_event(device->pnp.device_class, acpi_bus_generate_netlink_event(device->pnp.device_class,
device->dev.bus_id, event, 0); device->dev.bus_id, event, 0);
default: default:

2
drivers/acpi/sbs.c
View File

@ -440,7 +440,7 @@ static int acpi_sbs_generate_event(struct acpi_device *device,
strcpy(acpi_device_bid(device), bid); strcpy(acpi_device_bid(device), bid);
strcpy(acpi_device_class(device), class); strcpy(acpi_device_class(device), class);
result = acpi_bus_generate_event(device, event, state); result = acpi_bus_generate_proc_event(device, event, state);
strcpy(acpi_device_bid(device), bid_saved); strcpy(acpi_device_bid(device), bid_saved);
strcpy(acpi_device_class(device), class_saved); strcpy(acpi_device_class(device), class_saved);

8
drivers/acpi/thermal.c
View File

@ -485,7 +485,7 @@ static int acpi_thermal_critical(struct acpi_thermal *tz)
printk(KERN_EMERG printk(KERN_EMERG
"Critical temperature reached (%ld C), shutting down.\n", "Critical temperature reached (%ld C), shutting down.\n",
KELVIN_TO_CELSIUS(tz->temperature)); KELVIN_TO_CELSIUS(tz->temperature));
acpi_bus_generate_event(tz->device, ACPI_THERMAL_NOTIFY_CRITICAL, acpi_bus_generate_proc_event(tz->device, ACPI_THERMAL_NOTIFY_CRITICAL,
tz->trips.critical.flags.enabled); tz->trips.critical.flags.enabled);
acpi_bus_generate_netlink_event(tz->device->pnp.device_class, acpi_bus_generate_netlink_event(tz->device->pnp.device_class,
tz->device->dev.bus_id, tz->device->dev.bus_id,
@ -508,7 +508,7 @@ static int acpi_thermal_hot(struct acpi_thermal *tz)
} else if (tz->trips.hot.flags.enabled) } else if (tz->trips.hot.flags.enabled)
tz->trips.hot.flags.enabled = 0; tz->trips.hot.flags.enabled = 0;
acpi_bus_generate_event(tz->device, ACPI_THERMAL_NOTIFY_HOT, acpi_bus_generate_proc_event(tz->device, ACPI_THERMAL_NOTIFY_HOT,
tz->trips.hot.flags.enabled); tz->trips.hot.flags.enabled);
acpi_bus_generate_netlink_event(tz->device->pnp.device_class, acpi_bus_generate_netlink_event(tz->device->pnp.device_class,
tz->device->dev.bus_id, tz->device->dev.bus_id,
@ -1157,14 +1157,14 @@ static void acpi_thermal_notify(acpi_handle handle, u32 event, void *data)
case ACPI_THERMAL_NOTIFY_THRESHOLDS: case ACPI_THERMAL_NOTIFY_THRESHOLDS:
acpi_thermal_get_trip_points(tz); acpi_thermal_get_trip_points(tz);
acpi_thermal_check(tz); acpi_thermal_check(tz);
acpi_bus_generate_event(device, event, 0); acpi_bus_generate_proc_event(device, event, 0);
acpi_bus_generate_netlink_event(device->pnp.device_class, acpi_bus_generate_netlink_event(device->pnp.device_class,
device->dev.bus_id, event, 0); device->dev.bus_id, event, 0);
break; break;
case ACPI_THERMAL_NOTIFY_DEVICES: case ACPI_THERMAL_NOTIFY_DEVICES:
if (tz->flags.devices) if (tz->flags.devices)
acpi_thermal_get_devices(tz); acpi_thermal_get_devices(tz);
acpi_bus_generate_event(device, event, 0); acpi_bus_generate_proc_event(device, event, 0);
acpi_bus_generate_netlink_event(device->pnp.device_class, acpi_bus_generate_netlink_event(device->pnp.device_class,
device->dev.bus_id, event, 0); device->dev.bus_id, event, 0);
break; break;

10
drivers/acpi/video.c
View File

@ -1775,7 +1775,7 @@ static void acpi_video_bus_notify(acpi_handle handle, u32 event, void *data)
switch (event) { switch (event) {
case ACPI_VIDEO_NOTIFY_SWITCH: /* User requested a switch, case ACPI_VIDEO_NOTIFY_SWITCH: /* User requested a switch,
* most likely via hotkey. */ * most likely via hotkey. */
acpi_bus_generate_event(device, event, 0); acpi_bus_generate_proc_event(device, event, 0);
break; break;
case ACPI_VIDEO_NOTIFY_PROBE: /* User plugged in or removed a video case ACPI_VIDEO_NOTIFY_PROBE: /* User plugged in or removed a video
@ -1783,14 +1783,14 @@ static void acpi_video_bus_notify(acpi_handle handle, u32 event, void *data)
acpi_video_device_enumerate(video); acpi_video_device_enumerate(video);
acpi_video_device_rebind(video); acpi_video_device_rebind(video);
acpi_video_switch_output(video, event); acpi_video_switch_output(video, event);
acpi_bus_generate_event(device, event, 0); acpi_bus_generate_proc_event(device, event, 0);
break; break;
case ACPI_VIDEO_NOTIFY_CYCLE: /* Cycle Display output hotkey pressed. */ case ACPI_VIDEO_NOTIFY_CYCLE: /* Cycle Display output hotkey pressed. */
case ACPI_VIDEO_NOTIFY_NEXT_OUTPUT: /* Next Display output hotkey pressed. */ case ACPI_VIDEO_NOTIFY_NEXT_OUTPUT: /* Next Display output hotkey pressed. */
case ACPI_VIDEO_NOTIFY_PREV_OUTPUT: /* previous Display output hotkey pressed. */ case ACPI_VIDEO_NOTIFY_PREV_OUTPUT: /* previous Display output hotkey pressed. */
acpi_video_switch_output(video, event); acpi_video_switch_output(video, event);
acpi_bus_generate_event(device, event, 0); acpi_bus_generate_proc_event(device, event, 0);
break; break;
default: default:
@ -1815,7 +1815,7 @@ static void acpi_video_device_notify(acpi_handle handle, u32 event, void *data)
switch (event) { switch (event) {
case ACPI_VIDEO_NOTIFY_SWITCH: /* change in status (cycle output device) */ case ACPI_VIDEO_NOTIFY_SWITCH: /* change in status (cycle output device) */
case ACPI_VIDEO_NOTIFY_PROBE: /* change in status (output device status) */ case ACPI_VIDEO_NOTIFY_PROBE: /* change in status (output device status) */
acpi_bus_generate_event(device, event, 0); acpi_bus_generate_proc_event(device, event, 0);
break; break;
case ACPI_VIDEO_NOTIFY_CYCLE_BRIGHTNESS: /* Cycle brightness */ case ACPI_VIDEO_NOTIFY_CYCLE_BRIGHTNESS: /* Cycle brightness */
case ACPI_VIDEO_NOTIFY_INC_BRIGHTNESS: /* Increase brightness */ case ACPI_VIDEO_NOTIFY_INC_BRIGHTNESS: /* Increase brightness */
@ -1823,7 +1823,7 @@ static void acpi_video_device_notify(acpi_handle handle, u32 event, void *data)
case ACPI_VIDEO_NOTIFY_ZERO_BRIGHTNESS: /* zero brightnesss */ case ACPI_VIDEO_NOTIFY_ZERO_BRIGHTNESS: /* zero brightnesss */
case ACPI_VIDEO_NOTIFY_DISPLAY_OFF: /* display device off */ case ACPI_VIDEO_NOTIFY_DISPLAY_OFF: /* display device off */
acpi_video_switch_brightness(video_device, event); acpi_video_switch_brightness(video_device, event);
acpi_bus_generate_event(device, event, 0); acpi_bus_generate_proc_event(device, event, 0);
break; break;
default: default:
ACPI_DEBUG_PRINT((ACPI_DB_INFO, ACPI_DEBUG_PRINT((ACPI_DB_INFO,

2
drivers/char/sonypi.c
View File

@ -875,7 +875,7 @@ found:
#ifdef CONFIG_ACPI #ifdef CONFIG_ACPI
if (sonypi_acpi_device) if (sonypi_acpi_device)
acpi_bus_generate_event(sonypi_acpi_device, 1, event); acpi_bus_generate_proc_event(sonypi_acpi_device, 1, event);
#endif #endif
kfifo_put(sonypi_device.fifo, (unsigned char *)&event, sizeof(event)); kfifo_put(sonypi_device.fifo, (unsigned char *)&event, sizeof(event));

2
drivers/misc/asus-laptop.c
View File

@ -732,7 +732,7 @@ static void asus_hotk_notify(acpi_handle handle, u32 event, void *data)
lcd_blank(FB_BLANK_POWERDOWN); lcd_blank(FB_BLANK_POWERDOWN);
} }
acpi_bus_generate_event(hotk->device, event, acpi_bus_generate_proc_event(hotk->device, event,
hotk->event_count[event % 128]++); hotk->event_count[event % 128]++);
return; return;

4
drivers/misc/sony-laptop.c
View File

@ -904,7 +904,7 @@ static void sony_acpi_notify(acpi_handle handle, u32 event, void *data)
dprintk("sony_acpi_notify, event: 0x%.2x\n", ev); dprintk("sony_acpi_notify, event: 0x%.2x\n", ev);
sony_laptop_report_input_event(ev); sony_laptop_report_input_event(ev);
acpi_bus_generate_event(sony_nc_acpi_device, 1, ev); acpi_bus_generate_proc_event(sony_nc_acpi_device, 1, ev);
} }
static acpi_status sony_walk_callback(acpi_handle handle, u32 level, static acpi_status sony_walk_callback(acpi_handle handle, u32 level,
@ -2292,7 +2292,7 @@ static irqreturn_t sony_pic_irq(int irq, void *dev_id)
found: found:
sony_laptop_report_input_event(device_event); sony_laptop_report_input_event(device_event);
acpi_bus_generate_event(spic_dev.acpi_dev, 1, device_event); acpi_bus_generate_proc_event(spic_dev.acpi_dev, 1, device_event);
sonypi_compat_report_event(device_event); sonypi_compat_report_event(device_event);
return IRQ_HANDLED; return IRQ_HANDLED;

8
drivers/misc/thinkpad_acpi.c
View File

@ -1190,10 +1190,10 @@ static void hotkey_notify(struct ibm_struct *ibm, u32 event)
} }
if (sendacpi) if (sendacpi)
acpi_bus_generate_event(ibm->acpi->device, event, hkey); acpi_bus_generate_proc_event(ibm->acpi->device, event, hkey);
} else { } else {
printk(IBM_ERR "unknown hotkey notification event %d\n", event); printk(IBM_ERR "unknown hotkey notification event %d\n", event);
acpi_bus_generate_event(ibm->acpi->device, event, 0); acpi_bus_generate_proc_event(ibm->acpi->device, event, 0);
} }
} }
@ -2179,7 +2179,7 @@ static void dock_notify(struct ibm_struct *ibm, u32 event)
event, _sta(dock_handle)); event, _sta(dock_handle));
data = 0; /* unknown */ data = 0; /* unknown */
} }
acpi_bus_generate_event(ibm->acpi->device, event, data); acpi_bus_generate_proc_event(ibm->acpi->device, event, data);
acpi_bus_generate_netlink_event(ibm->acpi->device->pnp.device_class, acpi_bus_generate_netlink_event(ibm->acpi->device->pnp.device_class,
ibm->acpi->device->dev.bus_id, ibm->acpi->device->dev.bus_id,
event, data); event, data);
@ -2280,7 +2280,7 @@ static int __init bay_init(struct ibm_init_struct *iibm)
static void bay_notify(struct ibm_struct *ibm, u32 event) static void bay_notify(struct ibm_struct *ibm, u32 event)
{ {
acpi_bus_generate_event(ibm->acpi->device, event, 0); acpi_bus_generate_proc_event(ibm->acpi->device, event, 0);
acpi_bus_generate_netlink_event(ibm->acpi->device->pnp.device_class, acpi_bus_generate_netlink_event(ibm->acpi->device->pnp.device_class,
ibm->acpi->device->dev.bus_id, ibm->acpi->device->dev.bus_id,
event, 0); event, 0);

2
drivers/pci/hotplug/acpiphp_ibm.c
View File

@ -267,7 +267,7 @@ static void ibm_handle_events(acpi_handle handle, u32 event, void *context)
if (subevent == 0x80) { if (subevent == 0x80) {
dbg("%s: generationg bus event\n", __FUNCTION__); dbg("%s: generationg bus event\n", __FUNCTION__);
acpi_bus_generate_event(note->device, note->event, detail); acpi_bus_generate_proc_event(note->device, note->event, detail);
acpi_bus_generate_netlink_event(note->device->pnp.device_class, acpi_bus_generate_netlink_event(note->device->pnp.device_class,
note->device->dev.bus_id, note->device->dev.bus_id,
note->event, detail); note->event, detail);

7
include/acpi/acpi_bus.h
View File

@ -331,8 +331,13 @@ void acpi_bus_data_handler(acpi_handle handle, u32 function, void *context);
int acpi_bus_get_status(struct acpi_device *device); int acpi_bus_get_status(struct acpi_device *device);
int acpi_bus_get_power(acpi_handle handle, int *state); int acpi_bus_get_power(acpi_handle handle, int *state);
int acpi_bus_set_power(acpi_handle handle, int state); int acpi_bus_set_power(acpi_handle handle, int state);
int acpi_bus_generate_event(struct acpi_device *device, u8 type, int data); #ifdef CONFIG_ACPI_PROC_EVENT
int acpi_bus_generate_proc_event(struct acpi_device *device, u8 type, int data);
int acpi_bus_receive_event(struct acpi_bus_event *event); int acpi_bus_receive_event(struct acpi_bus_event *event);
#else
static inline int acpi_bus_generate_proc_event(struct acpi_device *device, u8 type, int data)
{ return 0; }
#endif
int acpi_bus_register_driver(struct acpi_driver *driver); int acpi_bus_register_driver(struct acpi_driver *driver);
void acpi_bus_unregister_driver(struct acpi_driver *driver); void acpi_bus_unregister_driver(struct acpi_driver *driver);
int acpi_bus_add(struct acpi_device **child, struct acpi_device *parent, int acpi_bus_add(struct acpi_device **child, struct acpi_device *parent,