[src/netbsd-9]: src/sys/arch/arm/rockchip Pull up following revision(s) (requ...

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

details:   https://anonhg.NetBSD.org/src/rev/c5c035d6d0f9
branches:  netbsd-9
changeset: 843687:c5c035d6d0f9
user:      martin <martin%NetBSD.org@localhost>
date:      Tue Dec 17 12:32:52 2019 +0000

description:
Pull up following revision(s) (requested by mrg in ticket #556):

        sys/arch/arm/rockchip/rk_vop.c: revision 1.3

rework slightly to avoid stupid gcc warnings.
ok jmcneill.

diffstat:

 sys/arch/arm/rockchip/rk_vop.c |  12 +++++-------
 1 files changed, 5 insertions(+), 7 deletions(-)

diffs (40 lines):

diff -r b666b55c372a -r c5c035d6d0f9 sys/arch/arm/rockchip/rk_vop.c
--- a/sys/arch/arm/rockchip/rk_vop.c    Tue Dec 17 12:30:36 2019 +0000
+++ b/sys/arch/arm/rockchip/rk_vop.c    Tue Dec 17 12:32:52 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: rk_vop.c,v 1.2.2.2 2019/11/16 16:48:25 martin Exp $ */
+/* $NetBSD: rk_vop.c,v 1.2.2.3 2019/12/17 12:32:52 martin Exp $ */
 
 /*-
  * Copyright (c) 2019 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rk_vop.c,v 1.2.2.2 2019/11/16 16:48:25 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rk_vop.c,v 1.2.2.3 2019/12/17 12:32:52 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -542,11 +542,6 @@
        }
 
        const u_int ep_index = fdt_endpoint_index(ep);
-       if (ep_index >= VOP_NEP) {
-               DRM_ERROR("endpoint index %d out of range\n", ep_index);
-               return ENXIO;
-       }
-
        switch (ep_index) {
        case VOP_EP_MIPI:
        case VOP_EP_MIPI1:
@@ -557,6 +552,9 @@
        case VOP_EP_DP:
                encoder_type = DRM_MODE_ENCODER_TMDS;
                break;
+       default:
+               DRM_ERROR("endpoint index %d out of range\n", ep_index);
+               return ENXIO;
        }
 
        sc->sc_encoder[ep_index].sc = sc;