From owner-svn-src-all@FreeBSD.ORG Sat May 31 11:08:24 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5511CA75; Sat, 31 May 2014 11:08:24 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3573A2EED; Sat, 31 May 2014 11:08:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4VB8OEw055986; Sat, 31 May 2014 11:08:24 GMT (envelope-from brueffer@svn.freebsd.org) Received: (from brueffer@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4VB8MTZ055975; Sat, 31 May 2014 11:08:22 GMT (envelope-from brueffer@svn.freebsd.org) Message-Id: <201405311108.s4VB8MTZ055975@svn.freebsd.org> From: Christian Brueffer Date: Sat, 31 May 2014 11:08:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r266921 - in stable/10/sys/dev: firewire my nfe siba sis sk tx usb/net X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 31 May 2014 11:08:24 -0000 Author: brueffer Date: Sat May 31 11:08:22 2014 New Revision: 266921 URL: http://svnweb.freebsd.org/changeset/base/266921 Log: MFC: r266270 Remove some unused variables. Modified: stable/10/sys/dev/firewire/sbp.c stable/10/sys/dev/my/if_my.c stable/10/sys/dev/nfe/if_nfe.c stable/10/sys/dev/siba/siba_core.c stable/10/sys/dev/sis/if_sis.c stable/10/sys/dev/sk/if_sk.c stable/10/sys/dev/tx/if_tx.c stable/10/sys/dev/usb/net/if_axge.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/dev/firewire/sbp.c ============================================================================== --- stable/10/sys/dev/firewire/sbp.c Sat May 31 11:07:30 2014 (r266920) +++ stable/10/sys/dev/firewire/sbp.c Sat May 31 11:08:22 2014 (r266921) @@ -2745,7 +2745,6 @@ sbp_dequeue_ocb(struct sbp_dev *sdev, st struct sbp_ocb *ocb; struct sbp_ocb *next; int s = splfw(), order = 0; - int flags; SBP_DEBUG(1) device_printf(sdev->target->sbp->fd.dev, @@ -2759,7 +2758,6 @@ END_DEBUG SBP_LOCK(sdev->target->sbp); for (ocb = STAILQ_FIRST(&sdev->ocbs); ocb != NULL; ocb = next) { next = STAILQ_NEXT(ocb, ocb); - flags = ocb->flags; if (OCB_MATCH(ocb, sbp_status)) { /* found */ STAILQ_REMOVE(&sdev->ocbs, ocb, sbp_ocb, ocb); Modified: stable/10/sys/dev/my/if_my.c ============================================================================== --- stable/10/sys/dev/my/if_my.c Sat May 31 11:07:30 2014 (r266920) +++ stable/10/sys/dev/my/if_my.c Sat May 31 11:08:22 2014 (r266921) @@ -657,10 +657,8 @@ static void my_setmode_mii(struct my_softc * sc, int media) { u_int16_t bmcr; - struct ifnet *ifp; MY_LOCK_ASSERT(sc); - ifp = sc->my_ifp; /* * If an autoneg session is in progress, stop it. */ Modified: stable/10/sys/dev/nfe/if_nfe.c ============================================================================== --- stable/10/sys/dev/nfe/if_nfe.c Sat May 31 11:07:30 2014 (r266920) +++ stable/10/sys/dev/nfe/if_nfe.c Sat May 31 11:08:22 2014 (r266921) @@ -1375,15 +1375,12 @@ nfe_free_rx_ring(struct nfe_softc *sc, s { struct nfe_rx_data *data; void *desc; - int i, descsize; + int i; - if (sc->nfe_flags & NFE_40BIT_ADDR) { + if (sc->nfe_flags & NFE_40BIT_ADDR) desc = ring->desc64; - descsize = sizeof (struct nfe_desc64); - } else { + else desc = ring->desc32; - descsize = sizeof (struct nfe_desc32); - } for (i = 0; i < NFE_RX_RING_COUNT; i++) { data = &ring->data[i]; Modified: stable/10/sys/dev/siba/siba_core.c ============================================================================== --- stable/10/sys/dev/siba/siba_core.c Sat May 31 11:07:30 2014 (r266920) +++ stable/10/sys/dev/siba/siba_core.c Sat May 31 11:08:22 2014 (r266921) @@ -1739,12 +1739,10 @@ static void siba_pcicore_init(struct siba_pci *spc) { struct siba_dev_softc *sd = spc->spc_dev; - struct siba_softc *siba; if (sd == NULL) return; - siba = sd->sd_bus; if (!siba_dev_isup_sub(sd)) siba_dev_up_sub(sd, 0); Modified: stable/10/sys/dev/sis/if_sis.c ============================================================================== --- stable/10/sys/dev/sis/if_sis.c Sat May 31 11:07:30 2014 (r266920) +++ stable/10/sys/dev/sis/if_sis.c Sat May 31 11:08:22 2014 (r266921) @@ -1616,11 +1616,9 @@ sis_tick(void *xsc) { struct sis_softc *sc; struct mii_data *mii; - struct ifnet *ifp; sc = xsc; SIS_LOCK_ASSERT(sc); - ifp = sc->sis_ifp; mii = device_get_softc(sc->sis_miibus); mii_tick(mii); Modified: stable/10/sys/dev/sk/if_sk.c ============================================================================== --- stable/10/sys/dev/sk/if_sk.c Sat May 31 11:07:30 2014 (r266920) +++ stable/10/sys/dev/sk/if_sk.c Sat May 31 11:08:22 2014 (r266921) @@ -2876,13 +2876,11 @@ static void sk_txeof(sc_if) struct sk_if_softc *sc_if; { - struct sk_softc *sc; struct sk_txdesc *txd; struct sk_tx_desc *cur_tx; struct ifnet *ifp; u_int32_t idx, sk_ctl; - sc = sc_if->sk_softc; ifp = sc_if->sk_ifp; txd = STAILQ_FIRST(&sc_if->sk_cdata.sk_txbusyq); Modified: stable/10/sys/dev/tx/if_tx.c ============================================================================== --- stable/10/sys/dev/tx/if_tx.c Sat May 31 11:07:30 2014 (r266920) +++ stable/10/sys/dev/tx/if_tx.c Sat May 31 11:08:22 2014 (r266921) @@ -1150,12 +1150,10 @@ epic_ifmedia_sts(struct ifnet *ifp, stru { epic_softc_t *sc; struct mii_data *mii; - struct ifmedia *ifm; sc = ifp->if_softc; mii = device_get_softc(sc->miibus); EPIC_LOCK(sc); - ifm = &mii->mii_media; /* Nothing should be selected if interface is down. */ if ((ifp->if_flags & IFF_UP) == 0) { Modified: stable/10/sys/dev/usb/net/if_axge.c ============================================================================== --- stable/10/sys/dev/usb/net/if_axge.c Sat May 31 11:07:30 2014 (r266920) +++ stable/10/sys/dev/usb/net/if_axge.c Sat May 31 11:08:22 2014 (r266921) @@ -910,7 +910,6 @@ axge_ioctl(struct ifnet *ifp, u_long cmd static int axge_rx_frame(struct usb_ether *ue, struct usb_page_cache *pc, int actlen) { - struct axge_softc *sc; struct axge_csum_hdr csum_hdr; int error, len, pos; int pkt_cnt; @@ -918,7 +917,6 @@ axge_rx_frame(struct usb_ether *ue, stru uint16_t hdr_off; uint16_t pktlen; - sc = uether_getsc(ue); pos = 0; len = 0; error = 0;