ACPI: Remove the old /proc/acpi/event interface (1696d9dc) · Commits · 戴 / test

Documentation/laptops/asus-laptop.txt

+4 −4

Documentation/laptops/sony-laptop.txt

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -12,10 +12,10 @@ Fn keys (hotkeys):
	------------------		------------------
	Some models report hotkeys through the SNC or SPIC devices, such events are		Some models report hotkeys through the SNC or SPIC devices, such events are
	reported both through the ACPI subsystem as acpi events and through the INPUT		reported both through the ACPI subsystem as acpi events and through the INPUT
	subsystem. See the logs of acpid or /proc/acpi/event and		subsystem. See the logs of /proc/bus/input/devices to find out what those
	/proc/bus/input/devices to find out what those events are and which input		events are and which input devices are created by the driver.
	devices are created by the driver. Additionally, loading the driver with the		Additionally, loading the driver with the debug option will report all events
	debug option will report all events in the kernel log.		in the kernel log.

	The "scancodes" passed to the input system (that can be remapped with udev)		The "scancodes" passed to the input system (that can be remapped with udev)
	are indexes to the table "sony_laptop_input_keycode_map" in the sony-laptop.c		are indexes to the table "sony_laptop_input_keycode_map" in the sony-laptop.c

drivers/acpi/Kconfig

+0 −18

Original line number	Original line	Diff line number	Diff line
	@@ -91,24 +91,6 @@ config ACPI_EC_DEBUGFS
	Thus this option is a debug option that helps to write ACPI drivers		Thus this option is a debug option that helps to write ACPI drivers
	and can be used to identify ACPI code or EC firmware bugs.		and can be used to identify ACPI code or EC firmware bugs.

	config ACPI_PROC_EVENT
	bool "Deprecated /proc/acpi/event support"
	depends on PROC_FS
	default y
	help
	A user-space daemon, acpid, typically reads /proc/acpi/event
	and handles all ACPI-generated events.

	These events are now delivered to user-space either
	via the input layer or as netlink events.

	This build option enables the old code for legacy
	user-space implementation. After some time, this will
	be moved under CONFIG_ACPI_PROCFS, and then deleted.

	Say Y here to retain the old behaviour. Say N if your
	user-space is newer than kernel 2.6.23 (September 2007).

	config ACPI_AC		config ACPI_AC
	tristate "AC Adapter"		tristate "AC Adapter"
	depends on X86		depends on X86

drivers/acpi/ac.c

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -267,7 +267,6 @@ static void acpi_ac_notify(struct acpi_device *device, u32 event)
	msleep(ac_sleep_before_get_state_ms);		msleep(ac_sleep_before_get_state_ms);

	acpi_ac_get_state(ac);		acpi_ac_get_state(ac);
	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,
	dev_name(&device->dev), event,		dev_name(&device->dev), event,
	(u32) ac->state);		(u32) ac->state);

drivers/acpi/acpi_pad.c

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -452,7 +452,6 @@ static void acpi_pad_notify(acpi_handle handle, u32 event,
	switch (event) {		switch (event) {
	case ACPI_PROCESSOR_AGGREGATOR_NOTIFY:		case ACPI_PROCESSOR_AGGREGATOR_NOTIFY:
	acpi_pad_handle_notify(handle);		acpi_pad_handle_notify(handle);
	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,
	dev_name(&device->dev), event, 0);		dev_name(&device->dev), event, 0);
	break;		break;

Original line number	Original line	Diff line number	Diff line
	@@ -8,8 +8,8 @@ http://acpi4asus.sf.net/

	This driver provides support for extra features of ACPI-compatible ASUS laptops.		This driver provides support for extra features of ACPI-compatible ASUS laptops.
	It may also support some MEDION, JVC or VICTOR laptops (such as MEDION 9675 or		It may also support some MEDION, JVC or VICTOR laptops (such as MEDION 9675 or
	VICTOR XP7210 for example). It makes all the extra buttons generate standard		VICTOR XP7210 for example). It makes all the extra buttons generate input
	ACPI events that go through /proc/acpi/events and input events (like keyboards).		events (like keyboards).
	On some models adds support for changing the display brightness and output,		On some models adds support for changing the display brightness and output,
	switching the LCD backlight on and off, and most importantly, allows you to		switching the LCD backlight on and off, and most importantly, allows you to
	blink those fancy LEDs intended for reporting mail and wireless status.		blink those fancy LEDs intended for reporting mail and wireless status.
	@@ -55,8 +55,8 @@ Usage
	DSDT) to me.		DSDT) to me.

	That's all, now, all the events generated by the hotkeys of your laptop		That's all, now, all the events generated by the hotkeys of your laptop
	should be reported in your /proc/acpi/event entry. You can check with		should be reported via netlink events. You can check with
	"acpi_listen".		"acpi_genl monitor" (part of the acpica project).

	Hotkeys are also reported as input keys (like keyboards) you can check		Hotkeys are also reported as input keys (like keyboards) you can check
	which key are supported using "xev" under X11.		which key are supported using "xev" under X11.

Admin message