These do not need powerhook functions.

ok jsg

4 files changed, 4 insertions, 37 deletions

diff --git a/sys/dev/pci/if_ix.c b/sys/dev/pci/if_ix.c
index 9081531e6c4..585b506875f 100644
--- a/sys/dev/pci/if_ix.c
+++ b/sys/dev/pci/if_ix.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ix.c,v 1.43 2010/08/11 11:35:09 jsg Exp $	*/
+/*	$OpenBSD: if_ix.c,v 1.44 2010/08/27 08:24:53 deraadt Exp $	*/
 
 /******************************************************************************
 
@@ -77,7 +77,6 @@ const struct pci_matchid ixgbe_devices[] = {
 int	ixgbe_probe(struct device *, void *, void *);
 void	ixgbe_attach(struct device *, struct device *, void *);
 int	ixgbe_detach(struct device *, int);
-void	ixgbe_power(int, void *);
 void	ixgbe_start(struct ifnet *);
 void	ixgbe_start_locked(struct tx_ring *, struct ifnet *);
 int	ixgbe_ioctl(struct ifnet *, u_long, caddr_t);
@@ -294,8 +293,6 @@ ixgbe_attach(struct device *parent, struct device *self, void *aux)
 	ctrl_ext |= IXGBE_CTRL_EXT_DRV_LOAD;
 	IXGBE_WRITE_REG(&sc->hw, IXGBE_CTRL_EXT, ctrl_ext);
 
-	sc->powerhook = powerhook_establish(ixgbe_power, sc);
-
 	printf(", address %s\n", ether_sprintf(sc->hw.mac.addr));
 
 	INIT_DEBUGOUT("ixgbe_attach: end");
@@ -346,19 +343,6 @@ ixgbe_detach(struct device *self, int flags)
 	return (0);
 }
 
-void
-ixgbe_power(int why, void *arg)
-{
-	struct ix_softc *sc = (struct ix_softc *)arg;
-	struct ifnet *ifp;
-
-	if (why == PWR_RESUME) {
-		ifp = &sc->arpcom.ac_if;
-		if (ifp->if_flags & IFF_UP)
-			ixgbe_init(sc);
-	}
-}
-
 /*********************************************************************
  *  Transmit entry point
  *
diff --git a/sys/dev/pci/if_ix.h b/sys/dev/pci/if_ix.h
index 816c2258155..bca4050468f 100644
--- a/sys/dev/pci/if_ix.h
+++ b/sys/dev/pci/if_ix.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ix.h,v 1.10 2010/03/22 17:09:27 jsg Exp $	*/
+/*	$OpenBSD: if_ix.h,v 1.11 2010/08/27 08:24:53 deraadt Exp $	*/
 
 /******************************************************************************
 
@@ -237,7 +237,6 @@ struct ix_softc {
 
 	struct ixgbe_hw	hw;
 	struct ixgbe_osdep	 osdep;
-	void			*powerhook;
 
 	struct resource	*pci_mem;
 	struct resource	*msix_mem;
diff --git a/sys/dev/pci/if_ixgb.c b/sys/dev/pci/if_ixgb.c
index 6530efa8c44..3e07d58018a 100644
--- a/sys/dev/pci/if_ixgb.c
+++ b/sys/dev/pci/if_ixgb.c
@@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 ***************************************************************************/
 
-/* $OpenBSD: if_ixgb.c,v 1.55 2009/08/13 14:24:47 jasper Exp $ */
+/* $OpenBSD: if_ixgb.c,v 1.56 2010/08/27 08:24:53 deraadt Exp $ */
 
 #include <dev/pci/if_ixgb.h>
 
@@ -65,7 +65,6 @@ const struct pci_matchid ixgb_devices[] = {
 int  ixgb_probe(struct device *, void *, void *);
 void ixgb_attach(struct device *, struct device *, void *);
 int  ixgb_intr(void *);
-void ixgb_power(int, void *);
 void ixgb_start(struct ifnet *);
 int  ixgb_ioctl(struct ifnet *, u_long, caddr_t);
 void ixgb_watchdog(struct ifnet *);
@@ -245,7 +244,6 @@ ixgb_attach(struct device *parent, struct device *self, void *aux)
 	printf(", address %s\n", ether_sprintf(sc->interface_data.ac_enaddr));
 
 	INIT_DEBUGOUT("ixgb_attach: end");
-	sc->sc_powerhook = powerhook_establish(ixgb_power, sc);
 	return;
 
 err_hw_init:
@@ -257,19 +255,6 @@ err_pci:
 	ixgb_free_pci_resources(sc);
 }
 
-void
-ixgb_power(int why, void *arg)
-{
-	struct ixgb_softc *sc = (struct ixgb_softc *)arg;
-	struct ifnet *ifp;
-
-	if (why == PWR_RESUME) {
-		ifp = &sc->interface_data.ac_if;
-		if (ifp->if_flags & IFF_UP)
-			ixgb_init(sc);
-	}
-}
-
 /*********************************************************************
  *  Transmit entry point
  *
diff --git a/sys/dev/pci/if_ixgb.h b/sys/dev/pci/if_ixgb.h
index da595b1530f..6b169435851 100644
--- a/sys/dev/pci/if_ixgb.h
+++ b/sys/dev/pci/if_ixgb.h
@@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 ***************************************************************************/
 
-/* $OpenBSD: if_ixgb.h,v 1.12 2010/04/20 22:05:43 tedu Exp $ */
+/* $OpenBSD: if_ixgb.h,v 1.13 2010/08/27 08:24:53 deraadt Exp $ */
 
 #ifndef _IXGB_H_DEFINED_
 #define _IXGB_H_DEFINED_
@@ -243,7 +243,6 @@ struct ixgb_softc {
 	struct timeout	ixgb_intr_enable;
 	struct timeout	timer_handle;
 	int		if_flags;
-	void		*sc_powerhook;
 
 	/* Info about the board itself */
 	u_int32_t	part_num;