Module Name: src
Committed By: jmcneill
Date: Sun Oct 21 11:09:20 UTC 2018
Modified Files:
src/sys/dev/acpi: amdccp_acpi.c
Log Message:
Fix boot messages
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/acpi/amdccp_acpi.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/dev/acpi/amdccp_acpi.c
diff -u src/sys/dev/acpi/amdccp_acpi.c:1.1 src/sys/dev/acpi/amdccp_acpi.c:1.2
--- src/sys/dev/acpi/amdccp_acpi.c:1.1 Fri Oct 19 21:09:10 2018
+++ src/sys/dev/acpi/amdccp_acpi.c Sun Oct 21 11:09:20 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: amdccp_acpi.c,v 1.1 2018/10/19 21:09:10 jakllsch Exp $ */
+/* $NetBSD: amdccp_acpi.c,v 1.2 2018/10/21 11:09:20 jmcneill Exp $ */
/*
* Copyright (c) 2018 Jonathan A. Kollasch
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdccp_acpi.c,v 1.1 2018/10/19 21:09:10 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdccp_acpi.c,v 1.2 2018/10/21 11:09:20 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -85,21 +85,21 @@ amdccp_acpi_attach(device_t parent, devi
mem = acpi_res_mem(&res, 0);
if (mem == NULL) {
- aprint_error(": couldn't find mem resource\n");
+ aprint_error_dev(self, "couldn't find mem resource\n");
goto done;
}
#if notyet
irq = acpi_res_irq(&res, 0);
if (irq == NULL) {
- aprint_error(": couldn't find irq resource\n");
+ aprint_error_dev(self, "couldn't find irq resource\n");
goto done;
}
#endif
sc->sc_bst = aa->aa_memt;
if (bus_space_map(aa->aa_memt, mem->ar_base, mem->ar_length, 0, &sc->sc_bsh) != 0) {
- aprint_error(": couldn't map registers\n");
+ aprint_error_dev(self, "couldn't map registers\n");
goto done;
}
@@ -113,9 +113,6 @@ amdccp_acpi_attach(device_t parent, devi
#endif
- aprint_naive("\n");
- aprint_normal(": AMD CCP\n");
-
amdccp_common_attach(sc);
done:
