[src/trunk]: src/sys/dev/pci/ixgbe Modify a liitle to reduce diff between ixg...

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

details:   https://anonhg.NetBSD.org/src/rev/52e8d8c18a5c
branches:  trunk
changeset: 934758:52e8d8c18a5c
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Thu Jun 18 09:00:11 2020 +0000

description:
Modify a liitle to reduce diff between ixgbe.c and ixv.c. No functional change.

diffstat:

 sys/dev/pci/ixgbe/ixgbe.c |  10 +++++-----
 sys/dev/pci/ixgbe/ixv.c   |  14 +++++++-------
 2 files changed, 12 insertions(+), 12 deletions(-)

diffs (104 lines):

diff -r 2083acc98947 -r 52e8d8c18a5c sys/dev/pci/ixgbe/ixgbe.c
--- a/sys/dev/pci/ixgbe/ixgbe.c Wed Jun 17 22:07:21 2020 +0000
+++ b/sys/dev/pci/ixgbe/ixgbe.c Thu Jun 18 09:00:11 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ixgbe.c,v 1.231 2020/06/17 09:11:13 msaitoh Exp $ */
+/* $NetBSD: ixgbe.c,v 1.232 2020/06/18 09:00:11 msaitoh Exp $ */
 
 /******************************************************************************
 
@@ -168,9 +168,9 @@
 static bool    ixgbe_resume(device_t, const pmf_qual_t *);
 static int     ixgbe_ifflags_cb(struct ethercom *);
 static int     ixgbe_ioctl(struct ifnet *, u_long, void *);
-static void    ixgbe_ifstop(struct ifnet *, int);
 static int     ixgbe_init(struct ifnet *);
 static void    ixgbe_init_locked(struct adapter *);
+static void    ixgbe_ifstop(struct ifnet *, int);
 static void    ixgbe_stop(void *);
 static void    ixgbe_init_device_features(struct adapter *);
 static void    ixgbe_check_fan_failure(struct adapter *, u32, bool);
@@ -4457,7 +4457,7 @@
 {
        struct adapter  *adapter = arg;
        device_t        dev = adapter->dev;
-       struct ix_queue *que = adapter->queues;
+       struct ix_queue *que = adapter->queues;
        u64             queues = 0;
        u64             v0, v1, v2, v3, v4, v5, v6, v7;
        int             hung = 0;
@@ -4530,7 +4530,7 @@
                }
        }
 
-       /* Only truely watchdog if all queues show hung */
+       /* Only truly watchdog if all queues show hung */
        if (hung == adapter->num_queues)
                goto watchdog;
 #if 0 /* XXX Avoid unexpectedly disabling interrupt forever (PR#53294) */
@@ -6258,7 +6258,7 @@
  *   return 0 on success, positive on failure
  ************************************************************************/
 static int
-ixgbe_ioctl(struct ifnet * ifp, u_long command, void *data)
+ixgbe_ioctl(struct ifnet *ifp, u_long command, void *data)
 {
        struct adapter  *adapter = ifp->if_softc;
        struct ixgbe_hw *hw = &adapter->hw;
diff -r 2083acc98947 -r 52e8d8c18a5c sys/dev/pci/ixgbe/ixv.c
--- a/sys/dev/pci/ixgbe/ixv.c   Wed Jun 17 22:07:21 2020 +0000
+++ b/sys/dev/pci/ixgbe/ixv.c   Thu Jun 18 09:00:11 2020 +0000
@@ -1,4 +1,4 @@
-/*$NetBSD: ixv.c,v 1.149 2020/06/11 09:16:05 msaitoh Exp $*/
+/*$NetBSD: ixv.c,v 1.150 2020/06/18 09:00:11 msaitoh Exp $*/
 
 /******************************************************************************
 
@@ -158,7 +158,7 @@
 static const ixgbe_vendor_info_t *ixv_lookup(const struct pci_attach_args *);
 
 /************************************************************************
- * FreeBSD Device Interface Entry Points
+ * NetBSD Device Interface Entry Points
  ************************************************************************/
 CFATTACH_DECL3_NEW(ixv, sizeof(struct adapter),
     ixv_probe, ixv_attach, ixv_detach, NULL, NULL, NULL,
@@ -319,8 +319,8 @@
 
        /* Allocate, clear, and link in our adapter structure */
        adapter = device_private(dev);
+       adapter->hw.back = adapter;
        adapter->dev = dev;
-       adapter->hw.back = adapter;
        hw = &adapter->hw;
 
        adapter->init_locked = ixv_init_locked;
@@ -341,7 +341,7 @@
        aprint_normal(": %s, Version - %s\n",
            ixv_strings[ent->index], ixv_driver_version);
 
-       /* Core Lock Init*/
+       /* Core Lock Init */
        IXGBE_CORE_LOCK_INIT(adapter, device_xname(dev));
 
        /* Do base PCI setup - map BAR0 */
@@ -1081,7 +1081,7 @@
 
 
 /************************************************************************
- * ixv_set_multi - Multicast Update
+ * ixv_set_rxfilter - Multicast Update
  *
  *   Called whenever multicast address list is updated.
  ************************************************************************/
@@ -3306,8 +3306,8 @@
        /* Round-robin affinity */
        kcpuset_zero(affinity);
        kcpuset_set(affinity, cpu_id % ncpu);
-       error = interrupt_distribute(adapter->osdep.ihs[vector],
-           affinity, NULL);
+       error = interrupt_distribute(adapter->osdep.ihs[vector], affinity,
+           NULL);
 
        aprint_normal_dev(dev,
            "for link, interrupting at %s", intrstr);