[src/trunk]: src/sys/arch/arm sunxi/drm, rockchip/drm: Avoid messy error output.

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

details:   https://anonhg.NetBSD.org/src/rev/c3336803eef8
branches:  trunk
changeset: 1028918:c3336803eef8
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Dec 19 12:28:44 2021 +0000

description:
sunxi/drm, rockchip/drm: Avoid messy error output.

diffstat:

 sys/arch/arm/rockchip/rk_drm.c |  23 ++++++++++++-----------
 sys/arch/arm/sunxi/sunxi_drm.c |  23 ++++++++++++-----------
 2 files changed, 24 insertions(+), 22 deletions(-)

diffs (102 lines):

diff -r 1d3fa9f94e4b -r c3336803eef8 sys/arch/arm/rockchip/rk_drm.c
--- a/sys/arch/arm/rockchip/rk_drm.c    Sun Dec 19 12:28:35 2021 +0000
+++ b/sys/arch/arm/rockchip/rk_drm.c    Sun Dec 19 12:28:44 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: rk_drm.c,v 1.13 2021/12/19 12:28:35 riastradh Exp $ */
+/* $NetBSD: rk_drm.c,v 1.14 2021/12/19 12:28:44 riastradh Exp $ */
 
 /*-
  * Copyright (c) 2019 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rk_drm.c,v 1.13 2021/12/19 12:28:35 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rk_drm.c,v 1.14 2021/12/19 12:28:44 riastradh Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -129,6 +129,16 @@
        prop_dictionary_t dict = device_properties(self);
        bool is_disabled;
 
+       aprint_naive("\n");
+
+       if (prop_dictionary_get_bool(dict, "disabled", &is_disabled) &&
+           is_disabled) {
+               aprint_normal(": (disabled)\n");
+               return;
+       }
+
+       aprint_normal("\n");
+
        sc->sc_dev = self;
        sc->sc_dmat = faa->faa_dmat;
        sc->sc_bst = faa->faa_bst;
@@ -142,15 +152,6 @@
                return;
        }
 
-       aprint_naive("\n");
-
-       if (prop_dictionary_get_bool(dict, "disabled", &is_disabled) && is_disabled) {
-               aprint_normal(": (disabled)\n");
-               return;
-       }
-
-       aprint_normal("\n");
-
        sc->sc_ddev = drm_dev_alloc(driver, sc->sc_dev);
        if (IS_ERR(sc->sc_ddev)) {
                aprint_error_dev(self, "couldn't allocate DRM device\n");
diff -r 1d3fa9f94e4b -r c3336803eef8 sys/arch/arm/sunxi/sunxi_drm.c
--- a/sys/arch/arm/sunxi/sunxi_drm.c    Sun Dec 19 12:28:35 2021 +0000
+++ b/sys/arch/arm/sunxi/sunxi_drm.c    Sun Dec 19 12:28:44 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_drm.c,v 1.22 2021/12/19 12:28:20 riastradh Exp $ */
+/* $NetBSD: sunxi_drm.c,v 1.23 2021/12/19 12:28:44 riastradh Exp $ */
 
 /*-
  * Copyright (c) 2019 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunxi_drm.c,v 1.22 2021/12/19 12:28:20 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_drm.c,v 1.23 2021/12/19 12:28:44 riastradh Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -138,6 +138,16 @@
        prop_dictionary_t dict = device_properties(self);
        bool is_disabled;
 
+       aprint_naive("\n");
+
+       if (prop_dictionary_get_bool(dict, "disabled", &is_disabled) &&
+           is_disabled) {
+               aprint_normal(": Display Engine Pipeline (disabled)\n");
+               return;
+       }
+
+       aprint_normal(": Display Engine Pipeline\n");
+
        sc->sc_dev = self;
        sc->sc_dmat = faa->faa_dmat;
        sc->sc_bst = faa->faa_bst;
@@ -151,15 +161,6 @@
                return;
        }
 
-       aprint_naive("\n");
-
-       if (prop_dictionary_get_bool(dict, "disabled", &is_disabled) && is_disabled) {
-               aprint_normal(": Display Engine Pipeline (disabled)\n");
-               return;
-       }
-
-       aprint_normal(": Display Engine Pipeline\n");
-
        sc->sc_ddev = drm_dev_alloc(driver, sc->sc_dev);
        if (IS_ERR(sc->sc_ddev)) {
                aprint_error_dev(self, "couldn't allocate DRM device\n");