[src/trunk]: src/sys/dev/acpi Use acpi_match_hid to match both _HID and _CID

[jmcneill <jmcneill%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/1b26b14de762
branches:  trunk
changeset: 968930:1b26b14de762
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Sat Feb 01 13:09:08 2020 +0000

description:
Use acpi_match_hid to match both _HID and _CID

diffstat:

 sys/dev/acpi/sdhc_acpi.c |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (28 lines):

diff -r 4006732f8018 -r 1b26b14de762 sys/dev/acpi/sdhc_acpi.c
--- a/sys/dev/acpi/sdhc_acpi.c  Sat Feb 01 12:55:35 2020 +0000
+++ b/sys/dev/acpi/sdhc_acpi.c  Sat Feb 01 13:09:08 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sdhc_acpi.c,v 1.9 2019/12/29 12:46:43 jmcneill Exp $   */
+/*     $NetBSD: sdhc_acpi.c,v 1.10 2020/02/01 13:09:08 jmcneill Exp $  */
 
 /*
  * Copyright (c) 2016 Kimihiro Nonaka <nonaka%NetBSD.org@localhost>
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sdhc_acpi.c,v 1.9 2019/12/29 12:46:43 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sdhc_acpi.c,v 1.10 2020/02/01 13:09:08 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -103,7 +103,8 @@
 
        for (i = 0; i < __arraycount(sdhc_acpi_slot_map); i++) {
                slot = &sdhc_acpi_slot_map[i];
-               if (strcmp(hid, slot->hid) == 0) {
+               const char * const slot_id[] = { slot->hid, NULL };
+               if (acpi_match_hid(ad, slot_id)) {
                        if (slot->uid == NULL ||
                            ((ad->Valid & ACPI_VALID_UID) != 0 &&
                             uid != NULL &&