Source-Changes-HG archive

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

[src/trunk]: src/sys/dev/acpi Don't use aprint_normal_dev("") to print the de...



details:   https://anonhg.NetBSD.org/src/rev/0824c4fc54cd
branches:  trunk
changeset: 1023995:0824c4fc54cd
user:      uwe <uwe%NetBSD.org@localhost>
date:      Wed Oct 06 20:10:42 2021 +0000

description:
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.

diffstat:

 sys/dev/acpi/wss_acpi.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (28 lines):

diff -r 28b5a4301190 -r 0824c4fc54cd sys/dev/acpi/wss_acpi.c
--- a/sys/dev/acpi/wss_acpi.c   Wed Oct 06 18:41:34 2021 +0000
+++ b/sys/dev/acpi/wss_acpi.c   Wed Oct 06 20:10:42 2021 +0000
@@ -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 <jmcneill%invisible.ca@localhost>
@@ -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 @@
                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;



Home | Main Index | Thread Index | Old Index