diff options
Diffstat (limited to 'sys/dev/pci/if_msk.c')
| -rw-r--r-- | sys/dev/pci/if_msk.c | 25 |
1 files changed, 1 insertions, 24 deletions
diff --git a/sys/dev/pci/if_msk.c b/sys/dev/pci/if_msk.c index 5acde94e34c..45c551beafd 100644 --- a/sys/dev/pci/if_msk.c +++ b/sys/dev/pci/if_msk.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_msk.c,v 1.89 2010/09/12 10:39:50 kettenis Exp $ */ +/* $OpenBSD: if_msk.c,v 1.90 2010/09/20 07:40:38 deraadt Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2000 @@ -136,7 +136,6 @@ void mskc_attach(struct device *, struct device *self, void *aux); int mskc_detach(struct device *, int); int mskc_activate(struct device *, int); void mskc_reset(struct sk_softc *); -void mskc_shutdown(void *); int msk_probe(struct device *, void *, void *); void msk_attach(struct device *, struct device *self, void *aux); int msk_detach(struct device *, int); @@ -991,8 +990,6 @@ msk_attach(struct device *parent, struct device *self, void *aux) ether_ifattach(ifp); m_clsetwms(ifp, sc_if->sk_pktlen, 2, MSK_RX_RING_CNT); - sc_if->sk_sdhook = shutdownhook_establish(mskc_shutdown, sc); - DPRINTFN(2, ("msk_attach: end\n")); return; @@ -1025,9 +1022,6 @@ msk_detach(struct device *self, int flags) msk_stop(sc_if, 1); - if (sc_if->sk_sdhook != NULL) - shutdownhook_disestablish(sc_if->sk_sdhook); - /* Detach any PHYs we might have. */ if (LIST_FIRST(&sc_if->sk_mii.mii_phys) != NULL) mii_detach(&sc_if->sk_mii, MII_PHY_ANY, MII_OFFSET_ANY); @@ -1598,23 +1592,6 @@ msk_watchdog(struct ifnet *ifp) } } -void -mskc_shutdown(void *v) -{ - struct sk_softc *sc = v; - - DPRINTFN(2, ("msk_shutdown\n")); - - /* Turn off the 'driver is loaded' LED. */ - CSR_WRITE_2(sc, SK_LED, SK_LED_GREEN_OFF); - - /* - * Reset the GEnesis controller. Doing this should also - * assert the resets on the attached XMAC(s). - */ - mskc_reset(sc); -} - static __inline int msk_rxvalid(struct sk_softc *sc, u_int32_t stat, u_int32_t len) { |