use new com.c bus-independent suspend/resume code, rather than trying to

craft broken local code here
ok kettenis

2 files changed, 5 insertions, 39 deletions

diff --git a/sys/dev/isa/com_isa.c b/sys/dev/isa/com_isa.c
index acacfdb67aa..8ca742345fb 100644
--- a/sys/dev/isa/com_isa.c
+++ b/sys/dev/isa/com_isa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: com_isa.c,v 1.6 2010/08/06 21:08:26 deraadt Exp $	*/
+/*	$OpenBSD: com_isa.c,v 1.7 2013/12/09 19:52:00 deraadt Exp $	*/
 /*
  * Copyright (c) 1997 - 1999, Jason Downs.  All rights reserved.
  *
@@ -74,11 +74,10 @@
 
 int com_isa_probe(struct device *, void *, void *);
 void com_isa_attach(struct device *, struct device *, void *);
-int com_isa_activate(struct device *, int);
 
 struct cfattach com_isa_ca = {
-        sizeof(struct com_softc), com_isa_probe, com_isa_attach, NULL,
-	com_isa_activate
+	sizeof(struct com_softc), com_isa_probe, com_isa_attach, NULL,
+	com_activate
 };
 
 int
@@ -176,19 +175,3 @@ com_isa_attach(struct device *parent, struct device *self, void *aux)
 #endif /* KGDB */
 	}
 }
-
-int
-com_isa_activate(struct device *self, int act)
-{
-	struct com_softc *sc = (struct com_softc *)self;
-
-	switch (act) {
-	case DVACT_SUSPEND:
-		break;
-	case DVACT_RESUME:
-		com_resume(sc);
-		break;
-	}
-
-	return (0);
-}
diff --git a/sys/dev/puc/com_puc.c b/sys/dev/puc/com_puc.c
index d0bba48fbf1..deccbed4c97 100644
--- a/sys/dev/puc/com_puc.c
+++ b/sys/dev/puc/com_puc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: com_puc.c,v 1.20 2011/11/15 22:27:53 deraadt Exp $	*/
+/*	$OpenBSD: com_puc.c,v 1.21 2013/12/09 19:52:01 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1997 - 1999, Jason Downs.  All rights reserved.
@@ -57,11 +57,10 @@
 int	com_puc_match(struct device *, void *, void *);
 void	com_puc_attach(struct device *, struct device *, void *);
 int	com_puc_detach(struct device *, int);
-int	com_puc_activate(struct device *, int);
 
 struct cfattach com_puc_ca = {
 	sizeof(struct com_softc), com_puc_match,
-	com_puc_attach, com_puc_detach, com_puc_activate
+	com_puc_attach, com_puc_detach, com_activate
 };
 
 int
@@ -115,19 +114,3 @@ com_puc_detach(struct device *self, int flags)
 {
 	return com_detach(self, flags);
 }
-
-int
-com_puc_activate(struct device *self, int act)
-{
-	struct com_softc *sc = (struct com_softc *)self;
-
-	switch (act) {
-	case DVACT_SUSPEND:
-		break;
-	case DVACT_RESUME:
-		com_resume(sc);
-		break;
-	}
-
-	return (0);
-}