CVS commit: src/sys/arch/arm/rockchip

[matthew green]

Module Name:    src
Committed By:   mrg
Date:           Sun Dec 15 00:49:01 UTC 2019

Modified Files:
        src/sys/arch/arm/rockchip: rk_vop.c

Log Message:
rework slightly to avoid stupid gcc warnings.

ok jmcneill.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/rockchip/rk_vop.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/arch/arm/rockchip/rk_vop.c
diff -u src/sys/arch/arm/rockchip/rk_vop.c:1.2 src/sys/arch/arm/rockchip/rk_vop.c:1.3
--- src/sys/arch/arm/rockchip/rk_vop.c:1.2	Thu Nov 14 20:31:50 2019
+++ src/sys/arch/arm/rockchip/rk_vop.c	Sun Dec 15 00:49:00 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: rk_vop.c,v 1.2 2019/11/14 20:31:50 jmcneill Exp $ */
+/* $NetBSD: rk_vop.c,v 1.3 2019/12/15 00:49:00 mrg Exp $ */
 
 /*-
  * Copyright (c) 2019 Jared D. McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rk_vop.c,v 1.2 2019/11/14 20:31:50 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rk_vop.c,v 1.3 2019/12/15 00:49:00 mrg Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -542,11 +542,6 @@ rk_vop_ep_activate(device_t dev, struct 
 	}
 
 	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 @@ rk_vop_ep_activate(device_t dev, struct 
 	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;