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

[Jared D. McNeill]

Module Name:    src
Committed By:   jmcneill
Date:           Tue Oct 25 22:49:39 UTC 2022

Modified Files:
        src/sys/arch/arm/xilinx: zynq7000_uart.c zynq_cemac.c

Log Message:
Fixup some mixed up log messages.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/xilinx/zynq7000_uart.c \
    src/sys/arch/arm/xilinx/zynq_cemac.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/xilinx/zynq7000_uart.c
diff -u src/sys/arch/arm/xilinx/zynq7000_uart.c:1.2 src/sys/arch/arm/xilinx/zynq7000_uart.c:1.3
--- src/sys/arch/arm/xilinx/zynq7000_uart.c:1.2	Wed Jan 27 03:10:20 2021
+++ src/sys/arch/arm/xilinx/zynq7000_uart.c	Tue Oct 25 22:49:39 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: zynq7000_uart.c,v 1.2 2021/01/27 03:10:20 thorpej Exp $	*/
+/*	$NetBSD: zynq7000_uart.c,v 1.3 2022/10/25 22:49:39 jmcneill Exp $	*/
 
 /*-
  * Copyright (c) 2015  Genetec Corporation.  All rights reserved.
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zynq7000_uart.c,v 1.2 2021/01/27 03:10:20 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zynq7000_uart.c,v 1.3 2022/10/25 22:49:39 jmcneill Exp $");
 
 #include "opt_soc.h"
 #include "opt_console.h"
@@ -75,13 +75,13 @@ zynquart_attach(device_t parent, device_
 	}
 
 	if (fdtbus_intr_establish(phandle, 0, IPL_SERIAL, IST_LEVEL,
-		zynquartintr, device_private(self)) == NULL) {
-		aprint_error_dev(self, "failed to establish interrupt on %s\n", intrstr);
+				  zynquartintr, device_private(self)) == NULL) {
+		aprint_error(": failed to establish interrupt on %s\n", intrstr);
 		return;
 	}
-	aprint_normal_dev(self, "interrupting on %s\n", intrstr);
 
 	zynquart_attach_common(parent, self, faa->faa_bst, addr, size, 0);
+	aprint_normal_dev(self, "interrupting on %s\n", intrstr);
 }
 
 /*
Index: src/sys/arch/arm/xilinx/zynq_cemac.c
diff -u src/sys/arch/arm/xilinx/zynq_cemac.c:1.2 src/sys/arch/arm/xilinx/zynq_cemac.c:1.3
--- src/sys/arch/arm/xilinx/zynq_cemac.c:1.2	Wed Jan 27 03:10:20 2021
+++ src/sys/arch/arm/xilinx/zynq_cemac.c	Tue Oct 25 22:49:39 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: zynq_cemac.c,v 1.2 2021/01/27 03:10:20 thorpej Exp $	*/
+/*	$NetBSD: zynq_cemac.c,v 1.3 2022/10/25 22:49:39 jmcneill Exp $	*/
 /*-
  * Copyright (c) 2015  Genetec Corporation.  All rights reserved.
  * Written by Hashimoto Kenichi for Genetec Corporation.
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zynq_cemac.c,v 1.2 2021/01/27 03:10:20 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zynq_cemac.c,v 1.3 2022/10/25 22:49:39 jmcneill Exp $");
 
 #include "opt_soc.h"
 
@@ -85,12 +85,12 @@ cemac_attach(device_t parent, device_t s
 	}
 
 	if (fdtbus_intr_establish(phandle, 0, IPL_NET, 0, cemac_intr,
-		device_private(self)) == NULL) {
-		aprint_error_dev(self, "failed to establish interrupt on %s\n", intrstr);
+				  device_private(self)) == NULL) {
+		aprint_error(": failed to establish interrupt on %s\n", intrstr);
 		return;
 	}
-	aprint_normal_dev(self, "interrupting on %s\n", intrstr);
 
 	cemac_attach_common(self, faa->faa_bst, ioh, faa->faa_dmat, CEMAC_FLAG_GEM);
+	aprint_normal_dev(self, "interrupting on %s\n", intrstr);
 }