Module Name: src
Committed By: uwe
Date: Wed Oct 6 20:10:42 UTC 2021
Modified Files:
src/sys/dev/acpi: wss_acpi.c
Log Message:
Don't use aprint_normal_dev("") to print the device name.
wssattach eventually calls ad1848_attach that prints the chip name
with ": %s". Usually that is a continuation of the attachment line,
e.g.
audiocs0 at ebus0 bar 14 offset 0x200000 line 3: CS4231A
but the wss? at acpi?: ... line we print is so long that we terminate
it and start a new one exclusively for ad1848_attach. Hence we do NOT
want the colon that _dev version supplies, it will be supplied by the
callee.
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/sys/dev/acpi/wss_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/wss_acpi.c
diff -u src/sys/dev/acpi/wss_acpi.c:1.36 src/sys/dev/acpi/wss_acpi.c:1.37
--- src/sys/dev/acpi/wss_acpi.c:1.36 Wed Oct 6 18:41:34 2021
+++ src/sys/dev/acpi/wss_acpi.c Wed Oct 6 20:10:42 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: wss_acpi.c,v 1.36 2021/10/06 18:41:34 uwe Exp $ */
+/* $NetBSD: wss_acpi.c,v 1.37 2021/10/06 20:10:42 uwe Exp $ */
/*
* Copyright (c) 2002 Jared D. McNeill <jmcne...@invisible.ca>
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wss_acpi.c,v 1.36 2021/10/06 18:41:34 uwe Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wss_acpi.c,v 1.37 2021/10/06 20:10:42 uwe Exp $");
#include <sys/param.h>
#include <sys/audioio.h>
@@ -180,8 +180,8 @@ wss_acpi_attach(device_t parent, device_
goto out;
}
- aprint_normal_dev(self, "");
/* Attach our wss device */
+ aprint_normal("%s", device_xname(self)); /* NB: sic! */
wssattach(sc);
arg.type = AUDIODEV_TYPE_OPL;
