Merge branches 'acpi-pci', 'acpi-misc' and 'acpi-tools'

* acpi-pci:
  ACPI,PCI,IRQ: remove SCI penalize function
  ACPI,PCI,IRQ: remove redundant code in acpi_irq_penalty_init()
  ACPI,PCI,IRQ: reduce static IRQ array size to 16
  ACPI,PCI,IRQ: reduce resource requirements

* acpi-misc:
  ACPI / sysfs: fix error code in get_status()
  ACPI / device_sysfs: Clean up checkpatch errors
  ACPI / device_sysfs: Change _SUN and _STA show functions error return to EIO
  ACPI / device_sysfs: Add sysfs support for _HRV hardware revision
  arm64: defconfig: Enable ACPI
  ACPI / ARM64: Remove EXPERT dependency for ACPI on ARM64
  ACPI / ARM64: Don't enable ACPI by default on ARM64
  acer-wmi: Use acpi_dev_found()
  eeepc-wmi: Use acpi_dev_found()
  ACPI / utils: Rename acpi_dev_present()

* acpi-tools:
  tools/power/acpi: close file only if it is open

diff --combined drivers/acpi/Kconfig
index b225c4b9ba140bd17eee6f9a19b2f09198c043a0,82b96ee8624c2b2713e981e9d9c4b0aefb9ae811,fa0d319283e31f0dc73994a5367e59410b0bcbe6,82b96ee8624c2b2713e981e9d9c4b0aefb9ae811..b7e2e776397d8384dd6459c0a9e9f94b097c113f
--- 1/drivers/acpi/Kconfig
--- 2/drivers/acpi/Kconfig
--- 3/drivers/acpi/Kconfig
--- 4/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@@@@ -5,10 -5,10 -5,10 -5,10 +5,10 @@@@@
    menuconfig ACPI
        bool "ACPI (Advanced Configuration and Power Interface) Support"
        depends on !IA64_HP_SIM
-- -    depends on IA64 || X86 || (ARM64 && EXPERT)
++ +    depends on IA64 || X86 || ARM64
        depends on PCI
        select PNP
-- -    default y
++ +    default y if (IA64 || X86)
        help
          Advanced Configuration and Power Interface (ACPI) support for 
          Linux requires an ACPI-compliant platform (hardware/firmware),
@@@@@ -311,12 -311,12 -311,12 -311,12 +311,12 @@@@@ config ACPI_CUSTOM_DSD
        bool
        default ACPI_CUSTOM_DSDT_FILE != ""
    
 ---config ACPI_INITRD_TABLE_OVERRIDE
 ---    bool "ACPI tables override via initrd"
 +++config ACPI_TABLE_UPGRADE
 +++    bool "Allow upgrading ACPI tables via initrd"
        depends on BLK_DEV_INITRD && X86
 ---    default n
 +++    default y
        help
 ---      This option provides functionality to override arbitrary ACPI tables
 +++      This option provides functionality to upgrade arbitrary ACPI tables
          via initrd. No functional change if no ACPI tables are passed via
          initrd, therefore it's safe to say Y.
          See Documentation/acpi/initrd_table_override.txt for details

diff --combined include/acpi/acpi_bus.h
index 3a932501d69078951ee4e70c1acd4ae429ca2a85,14362a84c78e3ca1d5712d284d6dce22ed656ba1,a84fd1533e2419c10c5fd4b94aef228e6d510dd0,14362a84c78e3ca1d5712d284d6dce22ed656ba1..4d40e9b5d938b448c50db763ad5466c1524c5008
--- 1/include/acpi/acpi_bus.h
--- 2/include/acpi/acpi_bus.h
--- 3/include/acpi/acpi_bus.h
--- 4/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
@@@@@ -87,7 -87,7 -87,7 -87,7 +87,7 @@@@@ acpi_evaluate_dsm_typed(acpi_handle han
          .package.elements = (eles)                    \
        }
    
-- -bool acpi_dev_present(const char *hid);
++ +bool acpi_dev_found(const char *hid);
    
    #ifdef CONFIG_ACPI
    
@@@@@ -394,13 -394,13 -394,13 -394,13 +394,13 @@@@@ struct acpi_data_node 
    
    static inline bool is_acpi_node(struct fwnode_handle *fwnode)
    {
 ---    return fwnode && (fwnode->type == FWNODE_ACPI
 +++    return !IS_ERR_OR_NULL(fwnode) && (fwnode->type == FWNODE_ACPI
                || fwnode->type == FWNODE_ACPI_DATA);
    }
    
    static inline bool is_acpi_device_node(struct fwnode_handle *fwnode)
    {
 ---    return fwnode && fwnode->type == FWNODE_ACPI;
 +++    return !IS_ERR_OR_NULL(fwnode) && fwnode->type == FWNODE_ACPI;
    }
    
    static inline struct acpi_device *to_acpi_device_node(struct fwnode_handle *fwnode)

diff --combined include/linux/acpi.h
index b25690bceab63411386eaa449e70a7fae5485618,0f413170c8f9a0b09dca114ef5d1ab5dd4e2439d,06ed7e54033e7ae5554e41461a51ca0be250695f,06ed7e54033e7ae5554e41461a51ca0be250695f..288fac5294f5e26aacfe97ac772d5f0247aa1dd2
--- 1/include/linux/acpi.h
--- 2/include/linux/acpi.h
--- 3/include/linux/acpi.h
--- 4/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@@@@ -190,6 -190,14 -190,14 -190,14 +190,6 @@@@@ static inline int acpi_debugger_notify_
    }
    #endif
    
 ---#ifdef CONFIG_ACPI_INITRD_TABLE_OVERRIDE
 ---void acpi_initrd_override(void *data, size_t size);
 ---#else
 ---static inline void acpi_initrd_override(void *data, size_t size)
 ---{
 ---}
 ---#endif
 ---
    #define BAD_MADT_ENTRY(entry, end) (                                            \
                (!entry) || (unsigned long)entry + sizeof(*entry) > end ||  \
                ((struct acpi_subtable_header *)entry)->length < sizeof(*entry))
@@@@@ -208,7 -216,6 -216,6 -216,6 +208,7 @@@@@ void acpi_boot_table_init (void)
    int acpi_mps_check (void);
    int acpi_numa_init (void);
    
 +++void early_acpi_table_init(void *data, size_t size);
    int acpi_table_init (void);
    int acpi_table_parse(char *id, acpi_tbl_table_handler handler);
    int __init acpi_parse_entries(char *id, unsigned long table_size,
@@@@@ -271,7 -278,6 -278,6 -278,6 +271,7 @@@@@ void acpi_irq_stats_init(void)
    extern u32 acpi_irq_handled;
    extern u32 acpi_irq_not_handled;
    extern unsigned int acpi_sci_irq;
 +++extern bool acpi_no_s5;
    #define INVALID_ACPI_IRQ    ((unsigned)-1)
    static inline bool acpi_sci_irq_valid(void)
    {
@@@@@ -305,7 -311,6 -311,7 -311,7 +305,6 @@@@@ struct pci_dev
    int acpi_pci_irq_enable (struct pci_dev *dev);
    void acpi_penalize_isa_irq(int irq, int active);
    bool acpi_isa_irq_available(int irq);
- --void acpi_penalize_sci_irq(int irq, int trigger, int polarity);
    void acpi_pci_irq_disable (struct pci_dev *dev);
    
    extern int ec_read(u8 addr, u8 *val);
@@@@@ -353,6 -358,7 -359,7 -359,7 +352,6 @@@@@ extern bool wmi_has_guid(const char *gu
    extern char acpi_video_backlight_string[];
    extern long acpi_is_video_device(acpi_handle handle);
    extern int acpi_blacklisted(void);
 ---extern void acpi_dmi_osi_linux(int enable, const struct dmi_system_id *d);
    extern void acpi_osi_setup(char *str);
    extern bool acpi_osi_is_win8(void);
    
@@@@@ -589,7 -595,6 -596,6 -596,6 +588,7 @@@@@ static inline const char *acpi_dev_name
        return NULL;
    }
    
 +++static inline void early_acpi_table_init(void *data, size_t size) { }
    static inline void acpi_early_init(void) { }
    static inline void acpi_subsystem_init(void) { }