diff options
| author | Kevin Lo <kevlo@cvs.openbsd.org> | 2009-01-10 15:33:06 +0000 |
|---|---|---|
| committer | Kevin Lo <kevlo@cvs.openbsd.org> | 2009-01-10 15:33:06 +0000 |
| commit | 88808c6031c351acfd8dd84873210a3e9e9c217b (patch) | |
| tree | 9614020e0f2d7e0a6b44f923ea1401a752ae412c /sys/dev/pci | |
| parent | 1c0eb0ce9b9237ccd1014bf260494f2f1c8ee86a (diff) | |
- remove unused variable
- eliminate hardcoded return value of jme_init_rx_ring()
ok jsg@
Diffstat (limited to 'sys/dev/pci')
| -rw-r--r-- | sys/dev/pci/if_jme.c | 5 | ||||
| -rw-r--r-- | sys/dev/pci/if_jmevar.h | 3 |
2 files changed, 3 insertions, 5 deletions
diff --git a/sys/dev/pci/if_jme.c b/sys/dev/pci/if_jme.c index ac37a0ef7fd..f0d264d68c9 100644 --- a/sys/dev/pci/if_jme.c +++ b/sys/dev/pci/if_jme.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_jme.c,v 1.14 2008/12/01 09:12:59 jsg Exp $ */ +/* $OpenBSD: if_jme.c,v 1.15 2009/01/10 15:33:05 kevlo Exp $ */ /*- * Copyright (c) 2008, Pyun YongHyeon <yongari@FreeBSD.org> * All rights reserved. @@ -853,7 +853,6 @@ jme_dma_alloc(struct jme_softc *sc) txd = &sc->jme_cdata.jme_txdesc[j]; bus_dmamap_destroy(sc->sc_dmat, txd->tx_dmamap); } - sc->jme_cdata.jme_tx_tag = NULL; return error; } @@ -1846,7 +1845,7 @@ jme_init(struct ifnet *ifp) printf("%s: initialization failed: no memory for Rx buffers.\n", sc->sc_dev.dv_xname); jme_stop(sc); - return (1); + return (error); } jme_init_tx_ring(sc); diff --git a/sys/dev/pci/if_jmevar.h b/sys/dev/pci/if_jmevar.h index 3af8a79beec..3cb3811c539 100644 --- a/sys/dev/pci/if_jmevar.h +++ b/sys/dev/pci/if_jmevar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_jmevar.h,v 1.4 2008/12/01 09:12:59 jsg Exp $ */ +/* $OpenBSD: if_jmevar.h,v 1.5 2009/01/10 15:33:05 kevlo Exp $ */ /*- * Copyright (c) 2008, Pyun YongHyeon <yongari@FreeBSD.org> * All rights reserved. @@ -112,7 +112,6 @@ struct jme_chain_data{ bus_dma_tag_t jme_buffer_tag; bus_dma_tag_t jme_ssb_tag; bus_dmamap_t jme_ssb_map; - bus_dma_tag_t jme_tx_tag; struct jme_txdesc jme_txdesc[JME_TX_RING_CNT]; bus_dma_tag_t jme_rx_tag; struct jme_rxdesc jme_rxdesc[JME_RX_RING_CNT]; |