From owner-svn-src-all@FreeBSD.ORG Fri May 16 21:19:20 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 0DA43F97;
Fri, 16 May 2014 21:19:20 +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 E2E1029E6;
Fri, 16 May 2014 21:19:19 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4GLJJXB017550;
Fri, 16 May 2014 21:19:19 GMT
(envelope-from brueffer@svn.freebsd.org)
Received: (from brueffer@localhost)
by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4GLJI3D017541;
Fri, 16 May 2014 21:19:18 GMT
(envelope-from brueffer@svn.freebsd.org)
Message-Id: <201405162119.s4GLJI3D017541@svn.freebsd.org>
From: Christian Brueffer <brueffer@FreeBSD.org>
Date: Fri, 16 May 2014 21:19:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r266270 - in head/sys/dev: firewire my nfe siba sis sk tx
usb/net
X-SVN-Group: head
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" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 16 May 2014 21:19:20 -0000
Author: brueffer
Date: Fri May 16 21:19:17 2014
New Revision: 266270
URL: http://svnweb.freebsd.org/changeset/base/266270
Log:
Remove some unused variables.
Found with: Clang Static Analyzer
MFC after: 2 weeks
Modified:
head/sys/dev/firewire/sbp.c
head/sys/dev/my/if_my.c
head/sys/dev/nfe/if_nfe.c
head/sys/dev/siba/siba_core.c
head/sys/dev/sis/if_sis.c
head/sys/dev/sk/if_sk.c
head/sys/dev/tx/if_tx.c
head/sys/dev/usb/net/if_axge.c
Modified: head/sys/dev/firewire/sbp.c
==============================================================================
--- head/sys/dev/firewire/sbp.c Fri May 16 19:28:22 2014 (r266269)
+++ head/sys/dev/firewire/sbp.c Fri May 16 21:19:17 2014 (r266270)
@@ -2748,7 +2748,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,
@@ -2762,7 +2761,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: head/sys/dev/my/if_my.c
==============================================================================
--- head/sys/dev/my/if_my.c Fri May 16 19:28:22 2014 (r266269)
+++ head/sys/dev/my/if_my.c Fri May 16 21:19:17 2014 (r266270)
@@ -658,10 +658,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: head/sys/dev/nfe/if_nfe.c
==============================================================================
--- head/sys/dev/nfe/if_nfe.c Fri May 16 19:28:22 2014 (r266269)
+++ head/sys/dev/nfe/if_nfe.c Fri May 16 21:19:17 2014 (r266270)
@@ -1376,15 +1376,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: head/sys/dev/siba/siba_core.c
==============================================================================
--- head/sys/dev/siba/siba_core.c Fri May 16 19:28:22 2014 (r266269)
+++ head/sys/dev/siba/siba_core.c Fri May 16 21:19:17 2014 (r266270)
@@ -1740,12 +1740,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: head/sys/dev/sis/if_sis.c
==============================================================================
--- head/sys/dev/sis/if_sis.c Fri May 16 19:28:22 2014 (r266269)
+++ head/sys/dev/sis/if_sis.c Fri May 16 21:19:17 2014 (r266270)
@@ -1617,11 +1617,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: head/sys/dev/sk/if_sk.c
==============================================================================
--- head/sys/dev/sk/if_sk.c Fri May 16 19:28:22 2014 (r266269)
+++ head/sys/dev/sk/if_sk.c Fri May 16 21:19:17 2014 (r266270)
@@ -2877,13 +2877,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: head/sys/dev/tx/if_tx.c
==============================================================================
--- head/sys/dev/tx/if_tx.c Fri May 16 19:28:22 2014 (r266269)
+++ head/sys/dev/tx/if_tx.c Fri May 16 21:19:17 2014 (r266270)
@@ -1151,12 +1151,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: head/sys/dev/usb/net/if_axge.c
==============================================================================
--- head/sys/dev/usb/net/if_axge.c Fri May 16 19:28:22 2014 (r266269)
+++ head/sys/dev/usb/net/if_axge.c Fri May 16 21:19:17 2014 (r266270)
@@ -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;