Merge remote-tracking branch 'asoc/topic/intel' into asoc-next

diff --combined sound/soc/intel/common/sst-match-acpi.c
index 3b4539d21492484ac2ba15cec78a36f4e135aee6,c429e2226d401ee29a8c4fc4b2ba474f0f3fe699..0b8ee04c593375006290e4ae8cc7d606bcb58264
--- 1/sound/soc/intel/common/sst-match-acpi.c
--- 2/sound/soc/intel/common/sst-match-acpi.c
+++ b/sound/soc/intel/common/sst-match-acpi.c
@@@ -13,34 -13,17 +13,20 @@@
   * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
   * more details.
   */
- #include <linux/acpi.h>
- #include <linux/device.h>
- #include <linux/module.h>
- #include <linux/platform_device.h>
  
  #include "sst-acpi.h"
  
- static acpi_status sst_acpi_mach_match(acpi_handle handle, u32 level,
-                                      void *context, void **ret)
- {
-       *(bool *)context = true;
-       return AE_OK;
- }
- 
  struct sst_acpi_mach *sst_acpi_find_machine(struct sst_acpi_mach *machines)
  {
        struct sst_acpi_mach *mach;
-       bool found = false;
  
        for (mach = machines; mach->id[0]; mach++)
-               if (ACPI_SUCCESS(acpi_get_devices(mach->id,
-                                                 sst_acpi_mach_match,
-                                                 &found, NULL)) && found)
+               if (acpi_dev_present(mach->id))
                        return mach;
  
        return NULL;
  }
  EXPORT_SYMBOL_GPL(sst_acpi_find_machine);
 +
 +MODULE_LICENSE("GPL v2");
 +MODULE_DESCRIPTION("Intel Common ACPI Match module");