[Zrouter-src-freebsd] ZRouter.org: push to FreeBSD HEAD tree

Tue Mar 13 10:06:46 UTC 2012

details:   http://zrouter.org/hg/FreeBSD/head//rev/3c1d901583cc
changeset: 428:3c1d901583cc
user:      ray at terran.dlink.ua
date:      Tue Mar 13 12:02:49 2012 +0200
description:
Remove unused inerrupt handlers. part 1.

diffstat:

 head/sys/dev/ral/rt2860.c    |  90 --------------------------------------------
 head/sys/dev/ral/rt2860var.h |   4 -
 2 files changed, 0 insertions(+), 94 deletions(-)

diffs (172 lines):

diff -r febb33b2c92f -r 3c1d901583cc head/sys/dev/ral/rt2860.c

--- a/head/sys/dev/ral/rt2860.c	Tue Mar 13 01:18:46 2012 +0200
+++ b/head/sys/dev/ral/rt2860.c	Tue Mar 13 12:02:49 2012 +0200
@@ -579,11 +579,7 @@
 static void rt2860_txrx_coherent_intr(struct rt2860_softc *sc);
 static void rt2860_fifo_sta_full_intr(struct rt2860_softc *sc);
 static void rt2860_rx_intr(struct rt2860_softc *sc);
-static void rt2860_rx_delay_intr(struct rt2860_softc *sc);
 static void rt2860_tx_intr(struct rt2860_softc *sc, int qid);
-static void rt2860_tx_delay_intr(struct rt2860_softc *sc);
-static void rt2860_pre_tbtt_intr(struct rt2860_softc *sc);
-static void rt2860_tbtt_intr(struct rt2860_softc *sc);
 static void rt2860_mcu_cmd_intr(struct rt2860_softc *sc);
 static void rt2860_auto_wakeup_intr(struct rt2860_softc *sc);
 static void rt2860_gp_timer_intr(struct rt2860_softc *sc);
@@ -935,14 +931,6 @@
 
 	mtx_destroy(&sc->sc_mtx);
 
-	bus_generic_detach(sc->sc_dev);
-
-	bus_teardown_intr(sc->sc_dev, sc->irq, sc->irqh);
-
-	bus_release_resource(sc->sc_dev, SYS_RES_IRQ, sc->irq_rid, sc->irq);
-
-	bus_release_resource(sc->sc_dev, SYS_RES_MEMORY, sc->mem_rid, sc->mem);
-
 	return 0;
 }
 
@@ -1644,8 +1632,6 @@
 		RT2860_REG_INT_GP_TIMER |
 		RT2860_REG_INT_AUTO_WAKEUP |
 		RT2860_REG_INT_FIFO_STA_FULL |
-		RT2860_REG_INT_PRE_TBTT |
-		RT2860_REG_INT_TBTT |
 		RT2860_REG_INT_TXRX_COHERENT |
 		RT2860_REG_INT_MCU_CMD |
 		RT2860_REG_INT_TX_MGMT_DONE |
@@ -5062,9 +5048,6 @@
 	if (status & RT2860_REG_INT_RX_DONE)
 		rt2860_rx_intr(sc);
 
-	if (status & RT2860_REG_INT_RX_DELAY_DONE)
-		rt2860_rx_delay_intr(sc);
-
 	if (status & RT2860_REG_INT_TX_HCCA_DONE)
 		rt2860_tx_intr(sc, 4);
 
@@ -5080,15 +5063,6 @@
 	if (status & RT2860_REG_INT_TX_AC0_DONE)
 		rt2860_tx_intr(sc, 0);
 
-	if (status & RT2860_REG_INT_TX_DELAY_DONE)
-		rt2860_tx_delay_intr(sc);
-
-	if (status & RT2860_REG_INT_PRE_TBTT)
-		rt2860_pre_tbtt_intr(sc);
-
-	if (status & RT2860_REG_INT_TBTT)
-		rt2860_tbtt_intr(sc);
-
 	if (status & RT2860_REG_INT_MCU_CMD)
 		rt2860_mcu_cmd_intr(sc);
 
@@ -5307,18 +5281,6 @@
 }
 
 /*
- * rt2860_rx_delay_intr
- */
-static void rt2860_rx_delay_intr(struct rt2860_softc *sc)
-{
-	RT2860_DPRINTF(sc, RT2860_DEBUG_INTR,
-		"%s: Rx delay interrupt\n",
-		device_get_nameunit(sc->sc_dev));
-
-	sc->rx_delay_interrupts++;
-}
-
-/*
  * rt2860_tx_intr
  */
 static void rt2860_tx_intr(struct rt2860_softc *sc, int qid)
@@ -5348,42 +5310,6 @@
 }
 
 /*
- * rt2860_tx_delay_intr
- */
-static void rt2860_tx_delay_intr(struct rt2860_softc *sc)
-{
-	RT2860_DPRINTF(sc, RT2860_DEBUG_INTR,
-		"%s: Tx delay interrupt\n",
-		device_get_nameunit(sc->sc_dev));
-
-	sc->tx_delay_interrupts++;
-}
-
-/*
- * rt2860_pre_tbtt_intr
- */
-static void rt2860_pre_tbtt_intr(struct rt2860_softc *sc)
-{
-	RT2860_DPRINTF(sc, RT2860_DEBUG_INTR,
-		"%s: Pre-TBTT interrupt\n",
-		device_get_nameunit(sc->sc_dev));
-
-	sc->pre_tbtt_interrupts++;
-}
-
-/*
- * rt2860_tbtt_intr
- */
-static void rt2860_tbtt_intr(struct rt2860_softc *sc)
-{
-	RT2860_DPRINTF(sc, RT2860_DEBUG_INTR,
-		"%s: TBTT interrupt\n",
-		device_get_nameunit(sc->sc_dev));
-
-	sc->tbtt_interrupts++;
-}
-
-/*
  * rt2860_mcu_cmd_intr
  */
 static void rt2860_mcu_cmd_intr(struct rt2860_softc *sc)
@@ -6886,10 +6812,6 @@
 		"Rx interrupts");
 
 	SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(stats), OID_AUTO,
-		"rx_delay_interrupts", CTLFLAG_RD, &sc->rx_delay_interrupts, 0,
-		"Rx delay interrupts");
-
-	SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(stats), OID_AUTO,
 		"tx_mgmt_interrupts", CTLFLAG_RD, &sc->tx_interrupts[5], 0,
 		"Tx MGMT interrupts");
 
@@ -6914,18 +6836,6 @@
 		"Tx AC0 interrupts");
 
 	SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(stats), OID_AUTO,
-		"tx_delay_interrupts", CTLFLAG_RD, &sc->tx_delay_interrupts, 0,
-		"Tx delay interrupts");
-
-	SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(stats), OID_AUTO,
-		"pre_tbtt_interrupts", CTLFLAG_RD, &sc->pre_tbtt_interrupts, 0,
-		"Pre-TBTT interrupts");
-
-	SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(stats), OID_AUTO,
-		"tbtt_interrupts", CTLFLAG_RD, &sc->tbtt_interrupts, 0,
-		"TBTT interrupts");
-
-	SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(stats), OID_AUTO,
 		"mcu_cmd_interrupts", CTLFLAG_RD, &sc->mcu_cmd_interrupts, 0,
 		"MCU command interrupts");
 
diff -r febb33b2c92f -r 3c1d901583cc head/sys/dev/ral/rt2860var.h
--- a/head/sys/dev/ral/rt2860var.h	Tue Mar 13 01:18:46 2012 +0200
+++ b/head/sys/dev/ral/rt2860var.h	Tue Mar 13 12:02:49 2012 +0200
@@ -596,11 +596,7 @@
 	unsigned long txrx_coherent_interrupts;
 	unsigned long fifo_sta_full_interrupts;
 	unsigned long rx_interrupts;
-	unsigned long rx_delay_interrupts;
 	unsigned long tx_interrupts[RT2860_SOFTC_TX_RING_COUNT];
-	unsigned long tx_delay_interrupts;
-	unsigned long pre_tbtt_interrupts;
-	unsigned long tbtt_interrupts;
 	unsigned long mcu_cmd_interrupts;
 	unsigned long auto_wakeup_interrupts;
 	unsigned long gp_timer_interrupts;
