Get rid of the clumsy pci_activate function and do this job inside ath.c

so that the powerhook wrapper can get at it
ok kettenis

1 files changed, 2 insertions, 21 deletions

diff --git a/sys/dev/pci/if_ath_pci.c b/sys/dev/pci/if_ath_pci.c
index 74334a7eb6e..a7cef1e0171 100644
--- a/sys/dev/pci/if_ath_pci.c
+++ b/sys/dev/pci/if_ath_pci.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: if_ath_pci.c,v 1.21 2010/07/02 06:08:38 reyk Exp $   */
+/*      $OpenBSD: if_ath_pci.c,v 1.22 2010/08/27 19:44:44 deraadt Exp $   */
 /*	$NetBSD: if_ath_pci.c,v 1.7 2004/06/30 05:58:17 mycroft Exp $	*/
 
 /*-
@@ -91,14 +91,13 @@ struct ath_pci_softc {
 int	 ath_pci_match(struct device *, void *, void *);
 void	 ath_pci_attach(struct device *, struct device *, void *);
 int	 ath_pci_detach(struct device *, int);
-int	 ath_pci_activate(struct device *, int);
 
 struct cfattach ath_pci_ca = {
 	sizeof(struct ath_pci_softc),
 	ath_pci_match,
 	ath_pci_attach,
 	ath_pci_detach,
-	ath_pci_activate
+	ath_activate
 };
 
 int
@@ -207,21 +206,3 @@ ath_pci_detach(struct device *self, int flags)
 
 	return (0);
 }
-
-int
-ath_pci_activate(struct device *self, int act)
-{
-	struct ath_pci_softc *psc = (struct ath_pci_softc *)self;
-	struct ath_softc *sc = &psc->sc_sc;
-
-	switch (act) {
-	case DVACT_SUSPEND:
-		/* It is safe to call ath's power hooks */
-		ath_power(PWR_SUSPEND, sc);
-		break;
-	case DVACT_RESUME:
-		ath_power(PWR_RESUME, sc);
-		break;
-	}
-	return (0);
-}