Merge tag 'pm+acpi-4.2-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...

Pull power management and ACPI fixes from Rafael Wysocki:
 "These are fixes that didn't make it to the previous PM+ACPI pull
  request or are fixing issues introduced by it.

  Specifics:

   - Fix a recently added memory leak in an error path in the ACPI
     resources management code (Dan Carpenter)

   - Fix a build warning triggered by an ACPI video header function that
     should be static inline (Borislav Petkov)

   - Change names of helper function converting struct fwnode_handle
     pointers to either struct device_node or struct acpi_device
     pointers so they don't conflict with local variable names
     (Alexander Sverdlin)

   - Make the hibernate core re-enable nonboot CPUs on failures to
     disable them as expected (Vitaly Kuznetsov)

   - Increase the default timeout of the device suspend watchdog to
     prevent it from triggering too early on some systems (Takashi Iwai)

   - Prevent the cpuidle powernv driver from registering idle states
     with CPUIDLE_FLAG_TIMER_STOP set if CONFIG_TICK_ONESHOT is unset
     which leads to boot hangs (Preeti U Murthy)"

* tag 'pm+acpi-4.2-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  tick/idle/powerpc: Do not register idle states with CPUIDLE_FLAG_TIMER_STOP set in periodic mode
  PM / sleep: Increase default DPM watchdog timeout to 60
  PM / hibernate: re-enable nonboot cpus on disable_nonboot_cpus() failure
  ACPI / OF: Rename of_node() and acpi_node() to to_of_node() and to_acpi_node()
  ACPI / video: Inline acpi_video_set_dmi_backlight_type
  ACPI / resources: free memory on error in add_region_before()

diff --combined include/linux/acpi.h
index 1618cdfb38c7b8e312f4a39b412593d4c480bc07,ed79b063f0271f80f54de899d75e1a8c8fc061f6..c471dfc93b716e162815709a25e5a705c4b45159
--- 1/include/linux/acpi.h
--- 2/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@@ -53,7 -53,7 +53,7 @@@ static inline acpi_handle acpi_device_h
        return adev ? adev->handle : NULL;
  }
  
- #define ACPI_COMPANION(dev)           acpi_node((dev)->fwnode)
+ #define ACPI_COMPANION(dev)           to_acpi_node((dev)->fwnode)
  #define ACPI_COMPANION_SET(dev, adev) set_primary_fwnode(dev, (adev) ? \
        acpi_fwnode_handle(adev) : NULL)
  #define ACPI_HANDLE(dev)              acpi_device_handle(ACPI_COMPANION(dev))
@@@ -261,13 -261,8 +261,13 @@@ extern void acpi_osi_setup(char *str)
  extern bool acpi_osi_is_win8(void);
  
  #ifdef CONFIG_ACPI_NUMA
 +int acpi_map_pxm_to_online_node(int pxm);
  int acpi_get_node(acpi_handle handle);
  #else
 +static inline int acpi_map_pxm_to_online_node(int pxm)
 +{
 +      return 0;
 +}
  static inline int acpi_get_node(acpi_handle handle)
  {
        return 0;
@@@ -454,7 -449,7 +454,7 @@@ static inline bool is_acpi_node(struct 
        return false;
  }
  
- static inline struct acpi_device *acpi_node(struct fwnode_handle *fwnode)
+ static inline struct acpi_device *to_acpi_node(struct fwnode_handle *fwnode)
  {
        return NULL;
  }