Module Name: src
Committed By: thorpej
Date: Fri Feb 19 18:05:42 UTC 2021
Modified Files:
src/sys/arch/powerpc/oea: ofw_consinit.c
Log Message:
Fix the previously differently.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/powerpc/oea/ofw_consinit.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/powerpc/oea/ofw_consinit.c
diff -u src/sys/arch/powerpc/oea/ofw_consinit.c:1.22 src/sys/arch/powerpc/oea/ofw_consinit.c:1.23
--- src/sys/arch/powerpc/oea/ofw_consinit.c:1.22 Fri Feb 19 17:58:43 2021
+++ src/sys/arch/powerpc/oea/ofw_consinit.c Fri Feb 19 18:05:42 2021
@@ -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 @@ cninit(void)
#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 @@ cninit(void)
#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 */
