From 412d27482923eca1df3d512f960e325502db5dcc Mon Sep 17 00:00:00 2001 From: msaitoh Date: Tue, 17 Apr 2018 08:38:05 +0000 Subject: Remove unused structure entries. No functional change. --- sys/dev/pci/ixgbe/ix_txrx.c | 9 ++------- sys/dev/pci/ixgbe/ixgbe.c | 3 +-- sys/dev/pci/ixgbe/ixgbe.h | 22 ++++++++-------------- sys/dev/pci/ixgbe/ixv.c | 3 +-- 4 files changed, 12 insertions(+), 25 deletions(-) (limited to 'sys/dev') diff --git a/sys/dev/pci/ixgbe/ix_txrx.c b/sys/dev/pci/ixgbe/ix_txrx.c index 33be8769877..541d811bcec 100644 --- a/sys/dev/pci/ixgbe/ix_txrx.c +++ b/sys/dev/pci/ixgbe/ix_txrx.c @@ -1,4 +1,4 @@ -/* $NetBSD: ix_txrx.c,v 1.39 2018/04/04 08:13:07 msaitoh Exp $ */ +/* $NetBSD: ix_txrx.c,v 1.40 2018/04/17 08:38:05 msaitoh Exp $ */ /****************************************************************************** @@ -494,8 +494,7 @@ retry: segaddr = htole64(map->dm_segs[j].ds_addr); txd->read.buffer_addr = segaddr; - txd->read.cmd_type_len = htole32(txr->txd_cmd | - cmd_type_len | seglen); + txd->read.cmd_type_len = htole32(cmd_type_len | seglen); txd->read.olinfo_status = htole32(olinfo_status); if (++i == txr->num_desc) @@ -2266,8 +2265,6 @@ ixgbe_allocate_queues(struct adapter *adapter) txr->num_desc = adapter->num_tx_desc; /* Initialize the TX side lock */ - snprintf(txr->mtx_name, sizeof(txr->mtx_name), "%s:tx(%d)", - device_xname(dev), txr->me); mutex_init(&txr->tx_mtx, MUTEX_DEFAULT, IPL_NET); if (ixgbe_dma_malloc(adapter, tsize, &txr->txdma, @@ -2318,8 +2315,6 @@ ixgbe_allocate_queues(struct adapter *adapter) rxr->num_desc = adapter->num_rx_desc; /* Initialize the RX side lock */ - snprintf(rxr->mtx_name, sizeof(rxr->mtx_name), "%s:rx(%d)", - device_xname(dev), rxr->me); mutex_init(&rxr->rx_mtx, MUTEX_DEFAULT, IPL_NET); if (ixgbe_dma_malloc(adapter, rsize, &rxr->rxdma, diff --git a/sys/dev/pci/ixgbe/ixgbe.c b/sys/dev/pci/ixgbe/ixgbe.c index 8d2d43e086a..9042f7db300 100644 --- a/sys/dev/pci/ixgbe/ixgbe.c +++ b/sys/dev/pci/ixgbe/ixgbe.c @@ -1,4 +1,4 @@ -/* $NetBSD: ixgbe.c,v 1.147 2018/04/17 05:23:58 knakahara Exp $ */ +/* $NetBSD: ixgbe.c,v 1.148 2018/04/17 08:38:05 msaitoh Exp $ */ /****************************************************************************** @@ -6282,7 +6282,6 @@ ixgbe_allocate_msix(struct adapter *adapter, const struct pci_attach_args *pa) adapter->osdep.intrs[vector], IPL_NET, ixgbe_msix_link, adapter, intr_xname); if (adapter->osdep.ihs[vector] == NULL) { - adapter->res = NULL; aprint_error_dev(dev, "Failed to register LINK handler\n"); error = ENXIO; goto err_out; diff --git a/sys/dev/pci/ixgbe/ixgbe.h b/sys/dev/pci/ixgbe/ixgbe.h index d6b28fdf773..bc0e3a7a2d5 100644 --- a/sys/dev/pci/ixgbe/ixgbe.h +++ b/sys/dev/pci/ixgbe/ixgbe.h @@ -1,4 +1,4 @@ -/* $NetBSD: ixgbe.h,v 1.42 2018/04/17 05:23:58 knakahara Exp $ */ +/* $NetBSD: ixgbe.h,v 1.43 2018/04/17 08:38:05 msaitoh Exp $ */ /****************************************************************************** SPDX-License-Identifier: BSD-3-Clause @@ -322,11 +322,9 @@ struct ixgbe_mc_addr { struct ix_queue { struct adapter *adapter; u32 msix; /* This queue's MSI-X vector */ - u32 eims; /* This queue's EIMS bit */ u32 eitr_setting; u32 me; struct resource *res; - void *tag; int busy; struct tx_ring *txr; struct rx_ring *rxr; @@ -365,9 +363,10 @@ struct tx_ring { u16 next_avail_desc; u16 next_to_clean; u16 num_desc; - u32 txd_cmd; ixgbe_dma_tag_t *txtag; - char mtx_name[16]; +#if 0 + char mtx_name[16]; /* NetBSD has no mutex name */ +#endif pcq_t *txr_interq; struct work wq_cookie; void *txr_si; @@ -415,7 +414,9 @@ struct rx_ring { u16 next_to_check; u16 num_desc; u16 mbuf_sz; - char mtx_name[16]; +#if 0 + char mtx_name[16]; /* NetBSD has no mutex name */ +#endif struct ixgbe_rx_buf *rx_buffers; ixgbe_dma_tag_t *ptag; @@ -461,17 +462,10 @@ struct adapter { struct resource *pci_mem; struct resource *msix_mem; - /* - * Interrupt resources: this set is - * either used for legacy, or for Link - * when doing MSI-X - */ - void *tag; - struct resource *res; + /* NetBSD: Interrupt resources are in osdep */ struct ifmedia media; callout_t timer; - int link_rid; int if_flags; kmutex_t core_mtx; diff --git a/sys/dev/pci/ixgbe/ixv.c b/sys/dev/pci/ixgbe/ixv.c index 7845740035a..55008509f09 100644 --- a/sys/dev/pci/ixgbe/ixv.c +++ b/sys/dev/pci/ixgbe/ixv.c @@ -1,4 +1,4 @@ -/*$NetBSD: ixv.c,v 1.93 2018/04/12 08:03:55 msaitoh Exp $*/ +/*$NetBSD: ixv.c,v 1.94 2018/04/17 08:38:05 msaitoh Exp $*/ /****************************************************************************** @@ -2985,7 +2985,6 @@ ixv_allocate_msix(struct adapter *adapter, const struct pci_attach_args *pa) adapter->osdep.intrs[vector], IPL_NET, ixv_msix_mbx, adapter, intr_xname); if (adapter->osdep.ihs[vector] == NULL) { - adapter->res = NULL; aprint_error_dev(dev, "Failed to register LINK handler\n"); kcpuset_destroy(affinity); return (ENXIO); -- cgit