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

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

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
parents 7e22e911 f8a571b2

arch/ia64/hp/common/aml_nfw.c

+1 −2
Original line number Diff line number Diff line
@@ -23,8 +23,7 @@ 
 */



#include <linux/module.h>

#include <acpi/acpi_bus.h>

#include <acpi/acpi_drivers.h>

#include <linux/acpi.h>

#include <asm/sal.h>



MODULE_AUTHOR("Bjorn Helgaas <bjorn.helgaas@hp.com>");

arch/x86/kernel/apic/apic_flat_64.c

+1 −3
Original line number Diff line number Diff line
@@ -21,9 +21,7 @@ 
#include <asm/apic.h>

#include <asm/ipi.h>



#ifdef CONFIG_ACPI

#include <acpi/acpi_bus.h>

#endif

#include <linux/acpi.h>



static struct apic apic_physflat;

static struct apic apic_flat;

arch/x86/kernel/apic/io_apic.c

+0 −3
Original line number Diff line number Diff line
@@ -37,9 +37,6 @@ 
#include <linux/kthread.h>

#include <linux/jiffies.h>	/* time_after() */

#include <linux/slab.h>

#ifdef CONFIG_ACPI

#include <acpi/acpi_bus.h>

#endif

#include <linux/bootmem.h>

#include <linux/dmar.h>

#include <linux/hpet.h>

arch/x86/pci/mmconfig-shared.c

+0 −1
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ 


#include <linux/pci.h>

#include <linux/init.h>

#include <linux/acpi.h>

#include <linux/sfi_acpi.h>

#include <linux/bitmap.h>

#include <linux/dmi.h>

arch/x86/pci/mmconfig_32.c

+0 −1
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ 
#include <linux/rcupdate.h>

#include <asm/e820.h>

#include <asm/pci_x86.h>

#include <acpi/acpi.h>



/* Assume systems with more busses have correct MCFG */

#define mmcfg_virt_addr ((void __iomem *) fix_to_virt(FIX_PCIE_MCFG))