[src/netbsd-9]: src/sys/dev/i2c Pull up following revision(s) (requested by m...

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

details:   https://anonhg.NetBSD.org/src/rev/7e21b4e763a5
branches:  netbsd-9
changeset: 466160:7e21b4e763a5
user:      martin <martin%NetBSD.org@localhost>
date:      Sat Dec 14 12:29:13 2019 +0000

description:
Pull up following revision(s) (requested by mlelstev in ticket #552):

        sys/dev/i2c/i2c.c: revision 1.70

Revert previous. Indirect matches are not wanted on platforms that
use external configuration data (FDT or OF).

diffstat:

 sys/dev/i2c/i2c.c |  13 ++++---------
 1 files changed, 4 insertions(+), 9 deletions(-)

diffs (41 lines):

diff -r b1e0ef4a5968 -r 7e21b4e763a5 sys/dev/i2c/i2c.c
--- a/sys/dev/i2c/i2c.c Sat Dec 14 12:26:05 2019 +0000
+++ b/sys/dev/i2c/i2c.c Sat Dec 14 12:29:13 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: i2c.c,v 1.69 2019/03/26 09:20:38 mlelstv Exp $ */
+/*     $NetBSD: i2c.c,v 1.69.4.1 2019/12/14 12:29:13 martin Exp $      */
 
 /*
  * Copyright (c) 2003 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
 #endif
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i2c.c,v 1.69 2019/03/26 09:20:38 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i2c.c,v 1.69.4.1 2019/12/14 12:29:13 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -719,8 +719,6 @@
                     const struct device_compatible_entry *compats,
                     int *match_resultp)
 {
-       int res;
-
        KASSERT(match_resultp != NULL);
 
        if (ia->ia_name != NULL &&
@@ -730,11 +728,8 @@
        }
 
        if (ia->ia_ncompat > 0 && ia->ia_compat != NULL) {
-               res = iic_compatible_match(ia, compats, NULL);
-               if (res) {
-                       *match_resultp = res;
-                       return true;
-               }
+               *match_resultp = iic_compatible_match(ia, compats, NULL);
+               return true;
        }
 
        return false;