[src/trunk]: src/sys/dev/i2c Replace 2 uses of of_match_compatible(). Also u...

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

details:   https://anonhg.NetBSD.org/src/rev/6e08c0d0d2fc
branches:  trunk
changeset: 950384:6e08c0d0d2fc
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Wed Jan 27 02:28:37 2021 +0000

description:
Replace 2 uses of of_match_compatible().  Also use DEVICE_COMPAT_EOL.

diffstat:

 sys/dev/i2c/twl4030.c |  22 ++++++++++++++--------
 1 files changed, 14 insertions(+), 8 deletions(-)

diffs (55 lines):

diff -r eb5f18f350f3 -r 6e08c0d0d2fc sys/dev/i2c/twl4030.c
--- a/sys/dev/i2c/twl4030.c     Wed Jan 27 01:58:15 2021 +0000
+++ b/sys/dev/i2c/twl4030.c     Wed Jan 27 02:28:37 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: twl4030.c,v 1.4 2021/01/17 21:42:35 thorpej Exp $ */
+/* $NetBSD: twl4030.c,v 1.5 2021/01/27 02:28:37 thorpej Exp $ */
 
 /*-
  * Copyright (c) 2019 Jared McNeill <jmcneill%invisible.ca@localhost>
@@ -29,7 +29,7 @@
 #include "opt_fdt.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: twl4030.c,v 1.4 2021/01/17 21:42:35 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: twl4030.c,v 1.5 2021/01/27 02:28:37 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -100,13 +100,19 @@
 
 static const struct device_compatible_entry compat_data[] = {
        { .compat = "ti,twl4030" },
-
-       { 0 }
+       DEVICE_COMPAT_EOL
 };
 
 #ifdef FDT
-static const char * const rtc_compatible[] = { "ti,twl4030-rtc", NULL };
-static const char * const gpio_compatible[] = { "ti,twl4030-gpio", NULL };
+static const struct device_compatible_entry rtc_compat_data[] = {
+       { .compat = "ti,twl4030-rtc" },
+       DEVICE_COMPAT_EOL
+};
+
+static const struct device_compatible_entry gpio_compat_data[] = {
+       { .compat = "ti,twl4030-gpio" },
+       DEVICE_COMPAT_EOL
+};
 #endif
 
 static uint8_t
@@ -384,10 +390,10 @@
 
 #ifdef FDT
        for (int child = OF_child(sc->sc_phandle); child; child = OF_peer(child)) {
-               if (of_match_compatible(child, gpio_compatible)) {
+               if (of_match_compat_data(child, gpio_compat_data)) {
                        aprint_normal(", GPIO");
                        twl_gpio_attach(sc, child);
-               } else if (of_match_compatible(child, rtc_compatible)) {
+               } else if (of_match_compat_data(child, rtc_compat_data)) {
                        aprint_normal(", RTC");
                        twl_rtc_attach(sc, child);
                }