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/pci/pccbb.c | |
| 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/pci/pccbb.c')
| -rw-r--r-- | sys/dev/pci/pccbb.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/sys/dev/pci/pccbb.c b/sys/dev/pci/pccbb.c index 1feb1a395e3..ee07d00828f 100644 --- a/sys/dev/pci/pccbb.c +++ b/sys/dev/pci/pccbb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pccbb.c,v 1.81 2010/09/06 18:34:34 kettenis Exp $ */ +/* $OpenBSD: pccbb.c,v 1.82 2010/09/07 16:21:45 deraadt Exp $ */ /* $NetBSD: pccbb.c,v 1.96 2004/03/28 09:49:31 nakayama Exp $ */ /* @@ -148,7 +148,6 @@ int pccbb_pcmcia_card_detect(pcmcia_chipset_handle_t pch); void pccbb_pcmcia_do_io_map(struct pcic_handle *, int); void pccbb_pcmcia_wait_ready(struct pcic_handle *); void pccbb_pcmcia_do_mem_map(struct pcic_handle *, int); -void pccbb_powerhook(int, void *); /* bus-space allocation and deallocation functions */ int pccbb_rbus_cb_space_alloc(cardbus_chipset_tag_t, rbus_tag_t, @@ -502,8 +501,6 @@ pccbb_pci_callback(struct device *self) sc->sc_pil = NULL; sc->sc_pil_intr_enable = 1; - powerhook_establish(pccbb_powerhook, sc); - sockstat = bus_space_read_4(base_memt, base_memh, CB_SOCKET_STAT); if ((sockstat & CB_SOCKET_STAT_CD) == 0) sc->sc_flags |= CBB_CARDEXIST; @@ -2904,9 +2901,3 @@ pccbbactivate(struct device *self, int act) } return (rv); } - -void -pccbb_powerhook(int why, void *arg) -{ - pccbbactivate(arg, why); -} |