summaryrefslogtreecommitdiff
path: root/sys/dev/pci
diff options
context:
space:
mode:
authorJonathan Gray <jsg@cvs.openbsd.org>2007-05-11 13:26:21 +0000
committerJonathan Gray <jsg@cvs.openbsd.org>2007-05-11 13:26:21 +0000
commit7b8b022108ec4df45a1ce1c6bfea0dcd9f1c98b3 (patch)
tree639c22fbba03aa5f2def46ed30280b68c5844685 /sys/dev/pci
parentc17f050eecf9247a0de23107ee814235f1acda3d (diff)
Ditch acard_pci_intr() as nothing currently uses it.
Pointed out by deraadt@
Diffstat (limited to 'sys/dev/pci')
-rw-r--r--sys/dev/pci/pciide.c37
1 files changed, 1 insertions, 36 deletions
diff --git a/sys/dev/pci/pciide.c b/sys/dev/pci/pciide.c
index 4f5548d13e8..ba0ca32911f 100644
--- a/sys/dev/pci/pciide.c
+++ b/sys/dev/pci/pciide.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pciide.c,v 1.267 2007/05/10 17:41:50 kettenis Exp $ */
+/* $OpenBSD: pciide.c,v 1.268 2007/05/11 13:26:20 jsg Exp $ */
/* $NetBSD: pciide.c,v 1.127 2001/08/03 01:31:08 tsutsui Exp $ */
/*
@@ -255,7 +255,6 @@ int hpt_pci_intr(void *);
void acard_chip_map(struct pciide_softc *, struct pci_attach_args *);
void acard_setup_channel(struct channel_softc *);
-int acard_pci_intr(void *);
void serverworks_chip_map(struct pciide_softc *, struct pci_attach_args *);
void serverworks_setup_channel(struct channel_softc *);
@@ -7738,40 +7737,6 @@ acard_setup_channel(struct channel_softc *chp)
}
}
-int
-acard_pci_intr(void *arg)
-{
- struct pciide_softc *sc = arg;
- struct pciide_channel *cp;
- struct channel_softc *wdc_cp;
- int rv = 0;
- int dmastat, i, crv;
-
- for (i = 0; i < sc->sc_wdcdev.nchannels; i++) {
- dmastat = bus_space_read_1(sc->sc_dma_iot, sc->sc_dma_ioh,
- IDEDMA_CTL(i));
- if ((dmastat & IDEDMA_CTL_INTR) == 0)
- continue;
- cp = &sc->pciide_channels[i];
- wdc_cp = &cp->wdc_channel;
- if ((wdc_cp->ch_flags & WDCF_IRQ_WAIT) == 0) {
- (void)wdcintr(wdc_cp);
- bus_space_write_1(sc->sc_dma_iot, sc->sc_dma_ioh,
- IDEDMA_CTL(i), dmastat);
- continue;
- }
- crv = wdcintr(wdc_cp);
- if (crv == 0)
- printf("%s:%d: bogus intr\n",
- sc->sc_wdcdev.sc_dev.dv_xname, i);
- else if (crv == 1)
- rv = 1;
- else if (rv == 0)
- rv = crv;
- }
- return (rv);
-}
-
void
nforce_chip_map(struct pciide_softc *sc, struct pci_attach_args *pa)
{