Source-Changes-HG archive

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

[src/trunk]: src/sys/dev/pci KNF. No binary change.



details:   https://anonhg.NetBSD.org/src/rev/83e16c7bcc57
branches:  trunk
changeset: 318953:83e16c7bcc57
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Thu May 10 03:41:00 2018 +0000
description:
KNF. No binary change.

diffstat:

 sys/dev/pci/ehci_pci.c |   6 +++---
 sys/dev/pci/if_wm.c    |  24 ++++++++++++------------
 sys/dev/pci/uhci_pci.c |   6 +++---
 3 files changed, 18 insertions(+), 18 deletions(-)

diffs (156 lines):

diff -r 0272b82863a2 -r 83e16c7bcc57 sys/dev/pci/ehci_pci.c
--- a/sys/dev/pci/ehci_pci.c    Thu May 10 03:15:28 2018 +0000
+++ b/sys/dev/pci/ehci_pci.c    Thu May 10 03:41:00 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ehci_pci.c,v 1.66 2018/04/09 16:21:10 jakllsch Exp $   */
+/*     $NetBSD: ehci_pci.c,v 1.67 2018/05/10 03:41:00 msaitoh Exp $    */
 
 /*
  * Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ehci_pci.c,v 1.66 2018/04/09 16:21:10 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci_pci.c,v 1.67 2018/05/10 03:41:00 msaitoh Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -191,7 +191,7 @@
        }
        aprint_normal_dev(self, "interrupting at %s\n", intrstr);
 
-       switch(pci_conf_read(pc, tag, PCI_USBREV) & PCI_USBREV_MASK) {
+       switch (pci_conf_read(pc, tag, PCI_USBREV) & PCI_USBREV_MASK) {
        case PCI_USBREV_PRE_1_0:
        case PCI_USBREV_1_0:
        case PCI_USBREV_1_1:
diff -r 0272b82863a2 -r 83e16c7bcc57 sys/dev/pci/if_wm.c
--- a/sys/dev/pci/if_wm.c       Thu May 10 03:15:28 2018 +0000
+++ b/sys/dev/pci/if_wm.c       Thu May 10 03:41:00 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_wm.c,v 1.578 2018/05/08 11:36:39 msaitoh Exp $      */
+/*     $NetBSD: if_wm.c,v 1.579 2018/05/10 03:43:42 msaitoh Exp $      */
 
 /*
  * Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -83,7 +83,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.578 2018/05/08 11:36:39 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.579 2018/05/10 03:43:42 msaitoh Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_net_mpsafe.h"
@@ -301,14 +301,14 @@
        struct evcnt qname##_ev_##evname;
 
 #define WM_Q_EVCNT_ATTACH(qname, evname, q, qnum, xname, evtype)       \
-       do{                                                             \
+       do {                                                            \
                snprintf((q)->qname##_##evname##_evcnt_name,            \
                    sizeof((q)->qname##_##evname##_evcnt_name),         \
                    "%s%02d%s", #qname, (qnum), #evname);               \
                evcnt_attach_dynamic(&(q)->qname##_ev_##evname,         \
                    (evtype), NULL, (xname),                            \
                    (q)->qname##_##evname##_evcnt_name);                \
-       }while(0)
+       } while (0)
 
 #define WM_Q_MISC_EVCNT_ATTACH(qname, evname, q, qnum, xname)          \
        WM_Q_EVCNT_ATTACH(qname, evname, q, qnum, xname, EVCNT_TYPE_MISC)
@@ -2203,7 +2203,7 @@
                /* SPI */
                sc->sc_flags |= WM_F_EEPROM_SPI;
                wm_nvm_set_addrbits_size_eecd(sc);
-               if((sc->sc_type == WM_T_80003)
+               if ((sc->sc_type == WM_T_80003)
                    || (sc->sc_nvm_wordsize < (1 << 15))) {
                        sc->nvm.read = wm_nvm_read_eerd;
                        /* Don't use WM_F_LOCK_EECD because we use EERD */
@@ -4905,7 +4905,7 @@
                int qid, reta_ent;
 
                qid  = i % sc->sc_nqueues;
-               switch(sc->sc_type) {
+               switch (sc->sc_type) {
                case WM_T_82574:
                        reta_ent = __SHIFTIN(qid,
                            RETA_ENT_QINDEX_MASK_82574);
@@ -4964,7 +4964,7 @@
                return;
        }
 
-       switch(sc->sc_type) {
+       switch (sc->sc_type) {
        case WM_T_82572:
                hw_ntxqueues = 2;
                hw_nrxqueues = 2;
@@ -5237,7 +5237,7 @@
        /*
         * must unset stopping flags in ascending order.
         */
-       for(i = 0; i < sc->sc_nqueues; i++) {
+       for (i = 0; i < sc->sc_nqueues; i++) {
                struct wm_txqueue *txq = &sc->sc_queue[i].wmq_txq;
                struct wm_rxqueue *rxq = &sc->sc_queue[i].wmq_rxq;
 
@@ -5265,7 +5265,7 @@
        /*
         * must set stopping flags in ascending order.
         */
-       for(i = 0; i < sc->sc_nqueues; i++) {
+       for (i = 0; i < sc->sc_nqueues; i++) {
                struct wm_rxqueue *rxq = &sc->sc_queue[i].wmq_rxq;
                struct wm_txqueue *txq = &sc->sc_queue[i].wmq_txq;
 
@@ -9148,7 +9148,7 @@
        if (sc->sc_core_stopping)
                goto out;
 
-       if((reg & ICR_LSC) != 0) {
+       if ((reg & ICR_LSC) != 0) {
                WM_EVCNT_INCR(&sc->sc_ev_linkintr);
                wm_linkintr(sc, ICR_LSC);
        }
@@ -11630,10 +11630,10 @@
 
        if ((val & (SFF_SFP_ETH_FLAGS_1000SX | SFF_SFP_ETH_FLAGS_1000LX)) != 0)
                mediatype = WM_MEDIATYPE_SERDES;
-       else if ((val & SFF_SFP_ETH_FLAGS_1000T) != 0){
+       else if ((val & SFF_SFP_ETH_FLAGS_1000T) != 0) {
                sc->sc_flags |= WM_F_SGMII;
                mediatype = WM_MEDIATYPE_COPPER;
-       } else if ((val & SFF_SFP_ETH_FLAGS_100FX) != 0){
+       } else if ((val & SFF_SFP_ETH_FLAGS_100FX) != 0) {
                sc->sc_flags |= WM_F_SGMII;
                mediatype = WM_MEDIATYPE_SERDES;
        }
diff -r 0272b82863a2 -r 83e16c7bcc57 sys/dev/pci/uhci_pci.c
--- a/sys/dev/pci/uhci_pci.c    Thu May 10 03:15:28 2018 +0000
+++ b/sys/dev/pci/uhci_pci.c    Thu May 10 03:41:00 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uhci_pci.c,v 1.62 2018/04/09 16:21:10 jakllsch Exp $   */
+/*     $NetBSD: uhci_pci.c,v 1.63 2018/05/10 03:41:00 msaitoh Exp $    */
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhci_pci.c,v 1.62 2018/04/09 16:21:10 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhci_pci.c,v 1.63 2018/05/10 03:41:00 msaitoh Exp $");
 
 #include "ehci.h"
 
@@ -154,7 +154,7 @@
            bus_space_read_2(sc->sc.iot, sc->sc.ioh, UHCI_STS));
        splx(s);
 
-       switch(pci_conf_read(pc, tag, PCI_USBREV) & PCI_USBREV_MASK) {
+       switch (pci_conf_read(pc, tag, PCI_USBREV) & PCI_USBREV_MASK) {
        case PCI_USBREV_PRE_1_0:
                sc->sc.sc_bus.ub_revision = USBREV_PRE_1_0;
                break;



Home | Main Index | Thread Index | Old Index