[src/netbsd-9]: src/sys/dev/pci Also pull up more cosmetic revisions to minim...

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

details:   https://anonhg.NetBSD.org/src/rev/22b196df4ffb
branches:  netbsd-9
changeset: 1001850:22b196df4ffb
user:      martin <martin%NetBSD.org@localhost>
date:      Tue Jul 07 12:02:29 2020 +0000

description:
Also pull up more cosmetic revisions to minimize diffs with HEAD, requested
by jmcneill in ticket #980:

        sys/dev/pci/if_aq.c                     1.8,1.17

constify, remove duplicate ;

diffstat:

 sys/dev/pci/if_aq.c |  12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diffs (54 lines):

diff -r 6638d1d71120 -r 22b196df4ffb sys/dev/pci/if_aq.c
--- a/sys/dev/pci/if_aq.c       Tue Jul 07 11:00:54 2020 +0000
+++ b/sys/dev/pci/if_aq.c       Tue Jul 07 12:02:29 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_aq.c,v 1.17.2.2 2020/07/07 10:29:05 martin Exp $    */
+/*     $NetBSD: if_aq.c,v 1.17.2.3 2020/07/07 12:02:29 martin Exp $    */
 
 /**
  * aQuantia Corporation Network Driver
@@ -62,7 +62,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_aq.c,v 1.17.2.2 2020/07/07 10:29:05 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_aq.c,v 1.17.2.3 2020/07/07 12:02:29 martin Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_if_aq.h"
@@ -952,7 +952,7 @@
        bus_space_tag_t sc_iot;
        bus_space_handle_t sc_ioh;
        bus_size_t sc_iosize;
-       bus_dma_tag_t sc_dmat;;
+       bus_dma_tag_t sc_dmat;
 
        void *sc_ihs[AQ_NINTR_MAX];
        pci_intr_handle_t *sc_intrs;
@@ -985,7 +985,7 @@
        kmutex_t sc_mutex;
        kmutex_t sc_mpi_mutex;
 
-       struct aq_firmware_ops *sc_fw_ops;
+       const struct aq_firmware_ops *sc_fw_ops;
        uint64_t sc_fw_caps;
        enum aq_media_type sc_media_type;
        aq_link_speed_t sc_available_rates;
@@ -1124,7 +1124,7 @@
 static int fw2x_get_temperature(struct aq_softc *, uint32_t *);
 #endif
 
-static struct aq_firmware_ops aq_fw1x_ops = {
+static const struct aq_firmware_ops aq_fw1x_ops = {
        .reset = fw1x_reset,
        .set_mode = fw1x_set_mode,
        .get_mode = fw1x_get_mode,
@@ -1134,7 +1134,7 @@
 #endif
 };
 
-static struct aq_firmware_ops aq_fw2x_ops = {
+static const struct aq_firmware_ops aq_fw2x_ops = {
        .reset = fw2x_reset,
        .set_mode = fw2x_set_mode,
        .get_mode = fw2x_get_mode,