Author: hselasky
Date: Thu Jul 3 16:29:21 2014
New Revision: 268221
URL: http://svnweb.freebsd.org/changeset/base/268221
Log:
MFC r266270:
Remove some unused variables.
Modified:
stable/9/sys/dev/firewire/sbp.c
stable/9/sys/dev/my/if_my.c
stable/9/sys/dev/nfe/if_nfe.c
stable/9/sys/dev/siba/siba_core.c
stable/9/sys/dev/sis/if_sis.c
stable/9/sys/dev/sk/if_sk.c
stable/9/sys/dev/tx/if_tx.c
stable/9/sys/dev/usb/net/if_axge.c
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/dev/ (props changed)
Modified: stable/9/sys/dev/firewire/sbp.c
==============================================================================
--- stable/9/sys/dev/firewire/sbp.c Thu Jul 3 16:26:37 2014
(r268220)
+++ stable/9/sys/dev/firewire/sbp.c Thu Jul 3 16:29:21 2014
(r268221)
@@ -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/9/sys/dev/my/if_my.c
==============================================================================
--- stable/9/sys/dev/my/if_my.c Thu Jul 3 16:26:37 2014 (r268220)
+++ stable/9/sys/dev/my/if_my.c Thu Jul 3 16:29:21 2014 (r268221)
@@ -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/9/sys/dev/nfe/if_nfe.c
==============================================================================
--- stable/9/sys/dev/nfe/if_nfe.c Thu Jul 3 16:26:37 2014
(r268220)
+++ stable/9/sys/dev/nfe/if_nfe.c Thu Jul 3 16:29:21 2014
(r268221)
@@ -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: stable/9/sys/dev/siba/siba_core.c
==============================================================================
--- stable/9/sys/dev/siba/siba_core.c Thu Jul 3 16:26:37 2014
(r268220)
+++ stable/9/sys/dev/siba/siba_core.c Thu Jul 3 16:29:21 2014
(r268221)
@@ -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/9/sys/dev/sis/if_sis.c
==============================================================================
--- stable/9/sys/dev/sis/if_sis.c Thu Jul 3 16:26:37 2014
(r268220)
+++ stable/9/sys/dev/sis/if_sis.c Thu Jul 3 16:29:21 2014
(r268221)
@@ -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: stable/9/sys/dev/sk/if_sk.c
==============================================================================
--- stable/9/sys/dev/sk/if_sk.c Thu Jul 3 16:26:37 2014 (r268220)
+++ stable/9/sys/dev/sk/if_sk.c Thu Jul 3 16:29:21 2014 (r268221)
@@ -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: stable/9/sys/dev/tx/if_tx.c
==============================================================================
--- stable/9/sys/dev/tx/if_tx.c Thu Jul 3 16:26:37 2014 (r268220)
+++ stable/9/sys/dev/tx/if_tx.c Thu Jul 3 16:29:21 2014 (r268221)
@@ -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/9/sys/dev/usb/net/if_axge.c
==============================================================================
--- stable/9/sys/dev/usb/net/if_axge.c Thu Jul 3 16:26:37 2014
(r268220)
+++ stable/9/sys/dev/usb/net/if_axge.c Thu Jul 3 16:29:21 2014
(r268221)
@@ -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;
_______________________________________________
svn-src-stable-9@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to "svn-src-stable-9-unsubscr...@freebsd.org"
