summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad Smith <brad@cvs.openbsd.org>2014-11-27 14:53:43 +0000
committerBrad Smith <brad@cvs.openbsd.org>2014-11-27 14:53:43 +0000
commitfa6ebbdb18418c8254eb2a94ba3fca9473337554 (patch)
tree40af19e087b86851c7ab9b4e57b55139adff7266
parent4c1aa1b90d6261f14cac0fb250d7e8c46c3ca2b2 (diff)
Garbage collect some bits that were never used.
ok mikeb@
-rw-r--r--sys/dev/ic/hme.c17
-rw-r--r--sys/dev/ic/hmevar.h6
2 files changed, 2 insertions, 21 deletions
diff --git a/sys/dev/ic/hme.c b/sys/dev/ic/hme.c
index 2836de57522..1a316127171 100644
--- a/sys/dev/ic/hme.c
+++ b/sys/dev/ic/hme.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hme.c,v 1.68 2014/11/27 05:47:25 brad Exp $ */
+/* $OpenBSD: hme.c,v 1.69 2014/11/27 14:53:42 brad Exp $ */
/* $NetBSD: hme.c,v 1.21 2001/07/07 15:59:37 thorpej Exp $ */
/*-
@@ -518,15 +518,6 @@ hme_init(struct hme_softc *sc)
/* Re-initialize the MIF */
hme_mifinit(sc);
- /* Call MI reset function if any */
- if (sc->sc_hwreset)
- (*sc->sc_hwreset)(sc);
-
-#if 0
- /* Mask all MIF interrupts, just in case */
- bus_space_write_4(t, mif, HME_MIFI_IMASK, 0xffff);
-#endif
-
/* step 3. Setup data structures in host memory */
hme_meminit(sc);
@@ -629,12 +620,6 @@ hme_init(struct hme_softc *sc)
v |= (HME_MAC_TXCFG_ENABLE | HME_MAC_TXCFG_DGIVEUP);
bus_space_write_4(t, mac, HME_MACI_TXCFG, v);
- /* step 14. Issue Transmit Pending command */
-
- /* Call MI initialization function if any */
- if (sc->sc_hwinit)
- (*sc->sc_hwinit)(sc);
-
/* Set the current media. */
mii_mediachg(&sc->sc_mii);
diff --git a/sys/dev/ic/hmevar.h b/sys/dev/ic/hmevar.h
index f9a3571c392..0de5c5fa6fd 100644
--- a/sys/dev/ic/hmevar.h
+++ b/sys/dev/ic/hmevar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: hmevar.h,v 1.16 2014/07/08 05:35:18 dlg Exp $ */
+/* $OpenBSD: hmevar.h,v 1.17 2014/11/27 14:53:42 brad Exp $ */
/* $NetBSD: hmevar.h,v 1.6 2000/09/28 10:56:57 tsutsui Exp $ */
/*-
@@ -80,10 +80,6 @@ struct hme_softc {
int sc_debug;
- /* Special hardware hooks */
- void (*sc_hwreset)(struct hme_softc *);
- void (*sc_hwinit)(struct hme_softc *);
-
struct hme_sxd sc_txd[HME_TX_RING_MAX], sc_rxd[HME_RX_RING_MAX];
bus_dmamap_t sc_rxmap_spare;
int sc_tx_cnt, sc_tx_prod, sc_tx_cons;