Merge branch 'acpi-cleanup'

* acpi-cleanup: (22 commits)
  ACPI / tables: Return proper error codes from acpi_table_parse() and fix comment.
  ACPI / tables: Check if id is NULL in acpi_table_parse()
  ACPI / proc: Include appropriate header file in proc.c
  ACPI / EC: Remove unused functions and add prototype declaration in internal.h
  ACPI / dock: Include appropriate header file in dock.c
  ACPI / PCI: Include appropriate header file in pci_link.c
  ACPI / PCI: Include appropriate header file in pci_slot.c
  ACPI / EC: Mark the function acpi_ec_add_debugfs() as static in ec_sys.c
  ACPI / NVS: Include appropriate header file in nvs.c
  ACPI / OSL: Mark the function acpi_table_checksum() as static
  ACPI / processor: initialize a variable to silence compiler warning
  ACPI / processor: use ACPI_COMPANION() to get ACPI device
  ACPI: correct minor typos
  ACPI / sleep: Drop redundant acpi_disabled check
  ACPI / dock: Drop redundant acpi_disabled check
  ACPI / table: Replace '1' with specific error return values
  ACPI: remove trailing whitespace
  ACPI / IBFT: Fix incorrect <acpi/acpi.h> inclusion in iSCSI boot firmware module
  ACPI / i915: Fix incorrect <acpi/acpi.h> inclusions via <linux/acpi_io.h>
  SFI / ACPI: Fix warnings reported during builds with W=1
  ...

Conflicts:
	drivers/acpi/nvs.c
	drivers/hwmon/asus_atk0110.c

diff --cc drivers/acpi/ac.c
Simple merge

diff --cc drivers/acpi/battery.c
Simple merge

diff --cc drivers/acpi/bus.c
Simple merge

diff --cc drivers/acpi/pci_root.c
Simple merge

diff --cc drivers/acpi/scan.c
Simple merge

diff --cc drivers/acpi/sleep.c
Simple merge

diff --cc drivers/acpi/sysfs.c
Simple merge

diff --cc drivers/char/tpm/tpm_ppi.c
Simple merge

diff --cc drivers/gpu/drm/i915/i915_drv.h
Simple merge

diff --cc drivers/gpu/drm/nouveau/nouveau_acpi.c
Simple merge

diff --cc drivers/pci/pci-acpi.c
Simple merge

diff --cc drivers/platform/x86/asus-laptop.c
Simple merge

diff --cc drivers/platform/x86/dell-wmi.c
Simple merge

diff --cc drivers/platform/x86/eeepc-laptop.c
Simple merge

diff --cc drivers/platform/x86/ideapad-laptop.c
Simple merge

diff --cc drivers/platform/x86/panasonic-laptop.c
Simple merge

diff --cc drivers/platform/x86/sony-laptop.c
Simple merge

diff --cc drivers/platform/x86/thinkpad_acpi.c
Simple merge

diff --cc drivers/platform/x86/toshiba_acpi.c
Simple merge

diff --cc drivers/platform/x86/wmi.c
Simple merge

diff --cc include/acpi/acpi_bus.h
Simple merge