Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/powerpc/oea Fix the previously differently.



details:   https://anonhg.NetBSD.org/src/rev/a9f992fe6991
branches:  trunk
changeset: 952846:a9f992fe6991
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Fri Feb 19 18:05:42 2021 +0000

description:
Fix the previously differently.

diffstat:

 sys/arch/powerpc/oea/ofw_consinit.c |  18 ++++++++----------
 1 files changed, 8 insertions(+), 10 deletions(-)

diffs (46 lines):

diff -r af605f3cb21f -r a9f992fe6991 sys/arch/powerpc/oea/ofw_consinit.c
--- a/sys/arch/powerpc/oea/ofw_consinit.c       Fri Feb 19 18:03:21 2021 +0000
+++ b/sys/arch/powerpc/oea/ofw_consinit.c       Fri Feb 19 18:05:42 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ofw_consinit.c,v 1.22 2021/02/19 17:58:43 thorpej Exp $ */
+/* $NetBSD: ofw_consinit.c,v 1.23 2021/02/19 18:05:42 thorpej Exp $ */
 
 /*-
  * Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofw_consinit.c,v 1.22 2021/02/19 17:58:43 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofw_consinit.c,v 1.23 2021/02/19 18:05:42 thorpej Exp $");
 
 #include "adb.h"
 #include "adbkbd.h"
@@ -137,10 +137,9 @@
 #ifdef PMAC_G5
                /* The MMU hasn't been initialized yet, use failsafe for now */
                extern struct consdev failsafe_cons;
-               struct consdev *cp = &failsafe_cons;
-               cn_tab = cp;
-               (*cp->cn_probe)(cp);
-               (*cp->cn_init)(cp);
+               cn_tab = &failsafe_cons;
+               (*cn_tab->cn_probe)(cn_tab);
+               (*cn_tab->cn_init)(cn_tab);
                aprint_verbose("Early G5 console initialized\n");
                return;
 #endif /* PMAC_G5 */
@@ -148,10 +147,9 @@
 #if (NZSTTY > 0) && !defined(MAMBO)
                OF_getprop(console_node, "name", name, sizeof(name));
                if (strcmp(name, "ch-a") == 0 || strcmp(name, "ch-b") == 0) {
-                       struct consdev *cp = &consdev_zs;
-                       (*cp->cn_probe)(cp);
-                       (*cp->cn_init)(cp);
-                       cn_tab = cp;
+                       cn_tab = &consdev_zs;
+                       (*cn_tab->cn_probe)(cn_tab);
+                       (*cn_tab->cn_init)(cn_tab);
                }
                return;
 #endif /* NZTTY */



Home | Main Index | Thread Index | Old Index