Commit d3e5e977 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'acpi-5.7-rc1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Pull more ACPI updates from Rafael Wysocki:
 "These prevent a false-positive static checker warning from triggering
  in the ACPI EC driver (Rafael Wysocki), fix white space in an ACPI
  document (Vilhelm Prytz) and add static annotation to one variable
  (Jason Yan)"

* tag 'acpi-5.7-rc1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  ACPI, x86/boot: make acpi_nobgrt static
  Documentation: firmware-guide: ACPI: fix table alignment in namespace.rst
  ACPI: EC: Fix up fast path check in acpi_ec_add()
parents bbec2a2d 0214da7c

arch/x86/kernel/acpi/boot.c

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ EXPORT_SYMBOL(acpi_disabled); 
#define PREFIX			"ACPI: "



int acpi_noirq;				/* skip ACPI IRQ initialization */

int acpi_nobgrt;			/* skip ACPI BGRT */

static int acpi_nobgrt;			/* skip ACPI BGRT */

int acpi_pci_disabled;		/* skip ACPI PCI scan and IRQ initialization */

EXPORT_SYMBOL(acpi_pci_disabled);

drivers/acpi/ec.c

+2 −2
Original line number Diff line number Diff line
@@ -1589,8 +1589,8 @@ static int acpi_ec_add(struct acpi_device *device) 
	strcpy(acpi_device_name(device), ACPI_EC_DEVICE_NAME);

	strcpy(acpi_device_class(device), ACPI_EC_CLASS);



	if ((boot_ec && boot_ec->handle == device->handle) ||

	    !strcmp(acpi_device_hid(device), ACPI_ECDT_HID)) {

	if (boot_ec && (boot_ec->handle == device->handle ||

	    !strcmp(acpi_device_hid(device), ACPI_ECDT_HID))) {

		/* Fast path: this device corresponds to the boot EC. */

		ec = boot_ec;

	} else {

Documentation/firmware-guide/acpi/namespace.rst

+3 −3

File changed.

Contains only whitespace changes.