Commit ea34e67a authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'acpi-misc' 

Merge an update fixing typos in ACPI documentation and comments for
6.17-rc1 (Bjorn Helgaas).

* acpi-misc:
  ACPI: Fix typos
parents a78dfdb6 f9db1fc5

Documentation/ABI/testing/sysfs-firmware-acpi

+3 −3
Original line number Diff line number Diff line
@@ -108,15 +108,15 @@ Description: 
		number of a "General Purpose Events" (GPE).



		A GPE vectors to a specified handler in AML, which

		can do a anything the BIOS writer wants from

		can do anything the BIOS writer wants from

		OS context.  GPE 0x12, for example, would vector

		to a level or edge handler called _L12 or _E12.

		The handler may do its business and return.

		Or the handler may send send a Notify event

		Or the handler may send a Notify event

		to a Linux device driver registered on an ACPI device,

		such as a battery, or a processor.



		To figure out where all the SCI's are coming from,

		To figure out where all the SCIs are coming from,

		/sys/firmware/acpi/interrupts contains a file listing

		every possible source, and the count of how many

		times it has triggered::

Documentation/firmware-guide/acpi/gpio-properties.rst

+2 −2
Original line number Diff line number Diff line
@@ -92,8 +92,8 @@ and polarity settings. The table below shows the expectations: 
|             | Low         | as low, assuming active                       |

+-------------+-------------+-----------------------------------------------+



That said, for our above example the both GPIOs, since the bias setting

is explicit and _DSD is present, will be treated as active with a high

That said, for our above example, since the bias setting is explicit and

_DSD is present, both GPIOs will be treated as active with a high

polarity and Linux will configure the pins in this state until a driver

reprograms them differently.

drivers/acpi/bus.c

+1 −1
Original line number Diff line number Diff line
@@ -1406,7 +1406,7 @@ static int __init acpi_bus_init(void) 
		goto error1;



	/*

	 * Register the for all standard device notifications.

	 * Register for all standard device notifications.

	 */

	status =

	    acpi_install_notify_handler(ACPI_ROOT_OBJECT, ACPI_SYSTEM_NOTIFY,