Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 25c87f7f authored by Len Brown's avatar Len Brown
Browse files

Pull events into release branch 



Conflicts:

	drivers/acpi/video.c

Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parents a4fd4946 3e069ee0

Documentation/feature-removal-schedule.txt

+8 −0
Original line number Diff line number Diff line
@@ -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

When:	Oct 2007

Files:	drivers/input/tsdev.c

drivers/acpi/Kconfig

+14 −0
Original line number Diff line number Diff line
@@ -68,6 +68,20 @@ config ACPI_PROCFS 


	  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

	tristate "AC Adapter"

	depends on X86

drivers/acpi/ac.c

+4 −1
Original line number Diff line number Diff line
@@ -204,7 +204,10 @@ static void acpi_ac_notify(acpi_handle handle, u32 event, void *data) 
	case ACPI_NOTIFY_BUS_CHECK:

	case ACPI_NOTIFY_DEVICE_CHECK:

		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,

						  device->dev.bus_id, event,

						  (u32) ac->state);

		break;

	default:

		ACPI_DEBUG_PRINT((ACPI_DB_INFO,

drivers/acpi/asus_acpi.c

+1 −1
Original line number Diff line number Diff line
@@ -1069,7 +1069,7 @@ static void asus_hotk_notify(acpi_handle handle, u32 event, void *data) 
		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]++);



	return;

drivers/acpi/battery.c

+4 −1
Original line number Diff line number Diff line
@@ -872,7 +872,10 @@ static void acpi_battery_notify(acpi_handle handle, u32 event, void *data) 
	case ACPI_NOTIFY_DEVICE_CHECK:

		device = battery->device;

		acpi_battery_notify_update(battery);

		acpi_bus_generate_event(device, event,

		acpi_bus_generate_proc_event(device, event,

					acpi_battery_present(battery));

		acpi_bus_generate_netlink_event(device->pnp.device_class,

						  device->dev.bus_id, event,

						  acpi_battery_present(battery));

		break;

	default: