summaryrefslogtreecommitdiff
path: root/sys/dev/ic
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev/ic')
-rw-r--r--sys/dev/ic/gemvar.h3
-rw-r--r--sys/dev/ic/pdqvar.h3
-rw-r--r--sys/dev/ic/pgt.c27
-rw-r--r--sys/dev/ic/pgtvar.h4
-rw-r--r--sys/dev/ic/ti.c18
-rw-r--r--sys/dev/ic/xl.c17
-rw-r--r--sys/dev/ic/xlreg.h3
7 files changed, 7 insertions, 68 deletions
diff --git a/sys/dev/ic/gemvar.h b/sys/dev/ic/gemvar.h
index 6f03356a857..9a084aaeef8 100644
--- a/sys/dev/ic/gemvar.h
+++ b/sys/dev/ic/gemvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: gemvar.h,v 1.25 2010/08/27 08:05:01 deraadt Exp $ */
+/* $OpenBSD: gemvar.h,v 1.26 2010/09/20 07:40:41 deraadt Exp $ */
/* $NetBSD: gemvar.h,v 1.1 2001/09/16 00:11:43 eeh Exp $ */
/*
@@ -198,7 +198,6 @@ struct gem_softc {
/* ========== */
int sc_inited;
int sc_debug;
- void *sc_sh; /* shutdownhook cookie */
/* Special hardware hooks */
void (*sc_hwreset)(struct gem_softc *);
diff --git a/sys/dev/ic/pdqvar.h b/sys/dev/ic/pdqvar.h
index 34b7d585096..0b1de57c2a9 100644
--- a/sys/dev/ic/pdqvar.h
+++ b/sys/dev/ic/pdqvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pdqvar.h,v 1.18 2006/03/25 22:41:43 djm Exp $ */
+/* $OpenBSD: pdqvar.h,v 1.19 2010/09/20 07:40:41 deraadt Exp $ */
/* $NetBSD: pdqvar.h,v 1.11 1996/10/25 21:33:37 cgd Exp $ */
/*-
@@ -194,7 +194,6 @@ typedef struct {
#elif defined(__NetBSD__) || defined(__OpenBSD__)
struct device sc_dev; /* base device */
void *sc_ih; /* interrupt vectoring */
- void *sc_ats; /* shutdown hook */
bus_space_tag_t sc_csrtag; /* space tag for CSRs */
bus_space_handle_t sc_csrhandle; /* space handle for CSRs */
#define sc_bc sc_csrtag
diff --git a/sys/dev/ic/pgt.c b/sys/dev/ic/pgt.c
index e8aa091f5fc..f425d4385d9 100644
--- a/sys/dev/ic/pgt.c
+++ b/sys/dev/ic/pgt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pgt.c,v 1.65 2010/09/07 16:21:42 deraadt Exp $ */
+/* $OpenBSD: pgt.c,v 1.66 2010/09/20 07:40:41 deraadt Exp $ */
/*
* Copyright (c) 2006 Claudio Jeker <claudio@openbsd.org>
@@ -192,7 +192,6 @@ int pgt_dma_alloc(struct pgt_softc *);
int pgt_dma_alloc_queue(struct pgt_softc *sc, enum pgt_queue pq);
void pgt_dma_free(struct pgt_softc *);
void pgt_dma_free_queue(struct pgt_softc *sc, enum pgt_queue pq);
-void pgt_shutdown(void *);
void pgt_resume(void *, void *);
void
@@ -634,12 +633,6 @@ pgt_detach(struct pgt_softc *sc)
pgt_stop(sc, SC_DYING);
pgt_reboot(sc);
- /*
- * Disable shutdown and power hooks
- */
- if (sc->sc_shutdown_hook != NULL)
- shutdownhook_disestablish(sc->sc_shutdown_hook);
-
ieee80211_ifdetach(&sc->sc_ic.ic_if);
if_detach(&sc->sc_ic.ic_if);
@@ -2025,14 +2018,6 @@ pgt_net_attach(struct pgt_softc *sc)
sc->sc_txtap.wt_ihdr.it_len = htole16(sc->sc_txtap_len);
sc->sc_txtap.wt_ihdr.it_present = htole32(PGT_TX_RADIOTAP_PRESENT);
#endif
-
- /*
- * Enable shutdown and power hooks
- */
- sc->sc_shutdown_hook = shutdownhook_establish(pgt_shutdown, sc);
- if (sc->sc_shutdown_hook == NULL)
- printf("%s: WARNING: unable to establish shutdown hook\n",
- sc->sc_dev.dv_xname);
return (0);
}
@@ -3296,16 +3281,6 @@ pgt_dma_free_queue(struct pgt_softc *sc, enum pgt_queue pq)
}
}
-void
-pgt_shutdown(void *arg)
-{
- struct pgt_softc *sc = arg;
-
- DPRINTF(("%s: %s\n", sc->sc_dev.dv_xname, __func__));
-
- pgt_stop(sc, SC_DYING);
-}
-
int
pgt_activate(struct device *self, int act)
{
diff --git a/sys/dev/ic/pgtvar.h b/sys/dev/ic/pgtvar.h
index cb44228bf62..fa6fb0067bd 100644
--- a/sys/dev/ic/pgtvar.h
+++ b/sys/dev/ic/pgtvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pgtvar.h,v 1.12 2010/08/27 20:06:39 deraadt Exp $ */
+/* $OpenBSD: pgtvar.h,v 1.13 2010/09/20 07:40:41 deraadt Exp $ */
/*
* Copyright (c) 2006 Claudio Jeker <claudio@openbsd.org>
@@ -178,8 +178,6 @@ struct pgt_softc {
int (*sc_enable)(struct pgt_softc *);
void (*sc_disable)(struct pgt_softc *);
void (*sc_power)(struct pgt_softc *, int);
- void *sc_shutdown_hook; /* shutdown hook */
- void *sc_power_hook; /* power mgmt hook */
struct pgt_mgmt_descq sc_mgmtinprog;
struct pgt_descq sc_freeq[PGT_QUEUE_COUNT];
diff --git a/sys/dev/ic/ti.c b/sys/dev/ic/ti.c
index 21475dd264e..e783f52c9c7 100644
--- a/sys/dev/ic/ti.c
+++ b/sys/dev/ic/ti.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ti.c,v 1.2 2009/12/13 13:21:54 kettenis Exp $ */
+/* $OpenBSD: ti.c,v 1.3 2010/09/20 07:40:41 deraadt Exp $ */
/*
* Copyright (c) 1997, 1998, 1999
@@ -132,7 +132,6 @@ void ti_init(void *);
void ti_init2(struct ti_softc *);
void ti_stop(struct ti_softc *);
void ti_watchdog(struct ifnet *);
-void ti_shutdown(void *);
int ti_ifmedia_upd(struct ifnet *);
void ti_ifmedia_sts(struct ifnet *, struct ifmediareq *);
@@ -1686,7 +1685,6 @@ ti_attach(struct ti_softc *sc)
if_attach(ifp);
ether_ifattach(ifp);
- shutdownhook_establish(ti_shutdown, sc);
return (0);
fail_3:
@@ -2528,17 +2526,3 @@ ti_stop(struct ti_softc *sc)
sc->ti_tx_considx.ti_idx = 0;
sc->ti_tx_saved_considx = TI_TXCONS_UNSET;
}
-
-/*
- * Stop all chip I/O so that the kernel's probe routines don't
- * get confused by errant DMAs when rebooting.
- */
-void
-ti_shutdown(void *xsc)
-{
- struct ti_softc *sc;
-
- sc = xsc;
-
- ti_chipinit(sc);
-}
diff --git a/sys/dev/ic/xl.c b/sys/dev/ic/xl.c
index 2b41113018e..9b2dc60a781 100644
--- a/sys/dev/ic/xl.c
+++ b/sys/dev/ic/xl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: xl.c,v 1.96 2010/09/07 16:21:43 deraadt Exp $ */
+/* $OpenBSD: xl.c,v 1.97 2010/09/20 07:40:41 deraadt Exp $ */
/*
* Copyright (c) 1997, 1998, 1999
@@ -163,7 +163,6 @@ void xl_start_90xB(struct ifnet *);
int xl_ioctl(struct ifnet *, u_long, caddr_t);
void xl_freetxrx(struct xl_softc *);
void xl_watchdog(struct ifnet *);
-void xl_shutdown(void *);
int xl_ifmedia_upd(struct ifnet *);
void xl_ifmedia_sts(struct ifnet *, struct ifmediareq *);
@@ -2677,8 +2676,6 @@ xl_attach(struct xl_softc *sc)
*/
if_attach(ifp);
ether_ifattach(ifp);
-
- sc->sc_sdhook = shutdownhook_establish(xl_shutdown, sc);
}
int
@@ -2699,24 +2696,12 @@ xl_detach(struct xl_softc *sc)
/* Delete all remaining media. */
ifmedia_delete_instance(&sc->sc_mii.mii_media, IFM_INST_ANY);
- if (sc->sc_sdhook != NULL)
- shutdownhook_disestablish(sc->sc_sdhook);
-
ether_ifdetach(ifp);
if_detach(ifp);
return (0);
}
-void
-xl_shutdown(void *v)
-{
- struct xl_softc *sc = (struct xl_softc *)v;
-
- xl_reset(sc);
- xl_stop(sc);
-}
-
struct cfdriver xl_cd = {
0, "xl", DV_IFNET
};
diff --git a/sys/dev/ic/xlreg.h b/sys/dev/ic/xlreg.h
index ec3713a395a..4a814b47ba5 100644
--- a/sys/dev/ic/xlreg.h
+++ b/sys/dev/ic/xlreg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: xlreg.h,v 1.24 2010/09/07 16:21:43 deraadt Exp $ */
+/* $OpenBSD: xlreg.h,v 1.25 2010/09/20 07:40:41 deraadt Exp $ */
/*
* Copyright (c) 1997, 1998
@@ -595,7 +595,6 @@ struct xl_softc {
struct xl_chain_data xl_cdata;
int xl_flags;
void (*intr_ack)(struct xl_softc *);
- void * sc_sdhook;
bus_dma_tag_t sc_dmat;
bus_dmamap_t sc_listmap;
bus_dma_segment_t sc_listseg[1];
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-30 08:27:12 +0000