diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2010-09-07 16:21:48 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2010-09-07 16:21:48 +0000 |
| commit | 0909b33ee356b8b24e8cfd8ef9abfcce75eac449 (patch) | |
| tree | 60b4dbc9eaed4dfda443b0bf3fa9ec06a75b03ad /sys/dev/pcmcia | |
| parent | 06c96fb315950bff13bd7a73d355ebdc21e85191 (diff) | |
remove the powerhook code. All architectures now use the ca_activate tree
traversal code to suspend/resume
ok oga kettenis blambert
Diffstat (limited to 'sys/dev/pcmcia')
| -rw-r--r-- | sys/dev/pcmcia/if_ray.c | 8 | ||||
| -rw-r--r-- | sys/dev/pcmcia/pcmcia.c | 10 |
2 files changed, 2 insertions, 16 deletions
diff --git a/sys/dev/pcmcia/if_ray.c b/sys/dev/pcmcia/if_ray.c index c12366b7b73..d3fde4b6003 100644 --- a/sys/dev/pcmcia/if_ray.c +++ b/sys/dev/pcmcia/if_ray.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ray.c,v 1.44 2010/09/06 19:20:23 deraadt Exp $ */ +/* $OpenBSD: if_ray.c,v 1.45 2010/09/07 16:21:46 deraadt Exp $ */ /* $NetBSD: if_ray.c,v 1.21 2000/07/05 02:35:54 onoe Exp $ */ /* @@ -172,7 +172,6 @@ struct ray_softc { struct pcmcia_mem_handle sc_mem; int sc_window; void *sc_ih; - void *sc_pwrhook; int sc_flags; #define RAY_FLAGS_RESUMEINIT 0x01 #define RAY_FLAGS_ATTACHED 0x02 @@ -633,8 +632,6 @@ ray_attach(struct device *parent, struct device *self, void *aux) /* disable the card */ pcmcia_function_disable(sc->sc_pf); - sc->sc_pwrhook = powerhook_establish(ray_power, sc); - /* The attach is successful. */ sc->sc_flags |= RAY_FLAGS_ATTACHED; return; @@ -701,9 +698,6 @@ ray_detach(struct device *self, int flags) ether_ifdetach(ifp); if_detach(ifp); - if (sc->sc_pwrhook != NULL) - powerhook_disestablish(sc->sc_pwrhook); - return (0); } diff --git a/sys/dev/pcmcia/pcmcia.c b/sys/dev/pcmcia/pcmcia.c index 5fe71c39ce3..5ca7638e957 100644 --- a/sys/dev/pcmcia/pcmcia.c +++ b/sys/dev/pcmcia/pcmcia.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pcmcia.c,v 1.42 2010/09/01 11:45:42 miod Exp $ */ +/* $OpenBSD: pcmcia.c,v 1.43 2010/09/07 16:21:46 deraadt Exp $ */ /* $NetBSD: pcmcia.c,v 1.9 1998/08/13 02:10:55 eeh Exp $ */ /* @@ -58,7 +58,6 @@ void pcmcia_attach(struct device *, struct device *, void *); int pcmcia_activate(struct device *, int); int pcmcia_print(void *, const char *); void pcmcia_card_detach_notify(struct device *, void *); -void pcmcia_powerhook(int why, void *arg); static inline void pcmcia_socket_enable(pcmcia_chipset_tag_t, pcmcia_chipset_handle_t *); @@ -130,7 +129,6 @@ pcmcia_attach(parent, self, aux) sc->iosize = paa->iosize; sc->ih = NULL; - powerhook_establish(pcmcia_powerhook, sc); } int @@ -167,12 +165,6 @@ pcmcia_activate(struct device *self, int act) return (0); } -void -pcmcia_powerhook(int why, void *arg) -{ - pcmcia_activate(arg, why); -} - int pcmcia_card_attach(dev) struct device *dev; |