[src/trunk]: src/sys/dev/ic Revert changes of athn.c r1.8.

[jakllsch <jakllsch%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/2c5095303e5e
branches:  trunk
changeset: 341681:2c5095303e5e
user:      jakllsch <jakllsch%NetBSD.org@localhost>
date:      Tue Nov 17 16:37:22 2015 +0000

description:
Revert changes of athn.c r1.8.

 - aprint_normal is correct for the attach message
 - KNF adjustments in code we sync with upstream are a nuisance
 - aprint_error{,_dev}() is inappropriate for use in runtime code

diffstat:

 sys/dev/ic/athn.c |  17 ++++++++---------
 1 files changed, 8 insertions(+), 9 deletions(-)

diffs (50 lines):

diff -r 6363cf1d8f38 -r 2c5095303e5e sys/dev/ic/athn.c
--- a/sys/dev/ic/athn.c Tue Nov 17 10:34:04 2015 +0000
+++ b/sys/dev/ic/athn.c Tue Nov 17 16:37:22 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: athn.c,v 1.11 2015/09/22 13:28:02 joerg Exp $  */
+/*     $NetBSD: athn.c,v 1.12 2015/11/17 16:37:22 jakllsch Exp $       */
 /*     $OpenBSD: athn.c,v 1.83 2014/07/22 13:12:11 mpi Exp $   */
 
 /*-
@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: athn.c,v 1.11 2015/09/22 13:28:02 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: athn.c,v 1.12 2015/11/17 16:37:22 jakllsch Exp $");
 
 #ifndef _MODULE
 #include "athn_usb.h"          /* for NATHN_USB */
@@ -234,16 +234,15 @@
            ((sc->sc_rxchainmask >> 0) & 1);
 
        if (AR_SINGLE_CHIP(sc)) {
-               aprint_normal_dev(sc->sc_dev,
-                   "Atheros %s\n", athn_get_mac_name(sc));
+               aprint_normal(": Atheros %s\n", athn_get_mac_name(sc));
                aprint_verbose_dev(sc->sc_dev,
                    "rev %d (%dT%dR), ROM rev %d, address %s\n",
                    sc->sc_mac_rev,
                    sc->sc_ntxchains, sc->sc_nrxchains, sc->sc_eep_rev,
                    ether_sprintf(ic->ic_myaddr));
-       } else {
-               aprint_normal_dev(sc->sc_dev,
-                   "Atheros %s, RF %s\n", athn_get_mac_name(sc),
+       }
+       else {
+               aprint_normal(": Atheros %s, RF %s\n", athn_get_mac_name(sc),
                    athn_get_rf_name(sc));
                aprint_verbose_dev(sc->sc_dev,
                    "rev %d (%dT%dR), ROM rev %d, address %s\n",
@@ -2825,8 +2824,8 @@
                /* avoid recursion in athn_resume */
                if (!pmf_device_subtree_resume(sc->sc_dev, &sc->sc_qual) ||
                    !device_is_active(sc->sc_dev)) {
-                       aprint_error_dev(sc->sc_dev,
-                           "failed to power up device\n");
+                       printf("%s: failed to power up device\n",
+                           device_xname(sc->sc_dev));
                        return 0;
                }
                ifp->if_flags = flags;