diff options
| author | David Gwynne <dlg@cvs.openbsd.org> | 2007-10-30 13:22:58 +0000 |
|---|---|---|
| committer | David Gwynne <dlg@cvs.openbsd.org> | 2007-10-30 13:22:58 +0000 |
| commit | cee73fc7571d5f0cf1c96431a655258f85ece789 (patch) | |
| tree | 7e07016b2fe2fcf7600d207fa79ef5369d21cef3 | |
| parent | e327965344a65abed184ed141bf944de3f0fc1dc (diff) | |
shrink the intr establish code a bit. all that intrstr handling is cruft.
| -rw-r--r-- | sys/dev/pci/arc.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/sys/dev/pci/arc.c b/sys/dev/pci/arc.c index 56057ec2f57..8c1f6b8f903 100644 --- a/sys/dev/pci/arc.c +++ b/sys/dev/pci/arc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: arc.c,v 1.70 2007/10/30 12:43:47 dlg Exp $ */ +/* $OpenBSD: arc.c,v 1.71 2007/10/30 13:22:57 dlg Exp $ */ /* * Copyright (c) 2006 David Gwynne <dlg@openbsd.org> @@ -875,7 +875,6 @@ arc_map_pci_resources(struct arc_softc *sc, struct pci_attach_args *pa) { pcireg_t memtype; pci_intr_handle_t ih; - const char *intrstr; sc->sc_pc = pa->pa_pc; sc->sc_tag = pa->pa_tag; @@ -892,16 +891,13 @@ arc_map_pci_resources(struct arc_softc *sc, struct pci_attach_args *pa) printf(": unable to map interrupt\n"); goto unmap; } - intrstr = pci_intr_string(pa->pa_pc, ih); sc->sc_ih = pci_intr_establish(pa->pa_pc, ih, IPL_BIO, arc_intr, sc, DEVNAME(sc)); if (sc->sc_ih == NULL) { - printf(": unable to map interrupt%s%s\n", - intrstr == NULL ? "" : " at ", - intrstr == NULL ? "" : intrstr); + printf(": unable to map interrupt\n"); goto unmap; } - printf(": %s\n", intrstr); + printf(": %s\n", pci_intr_string(pa->pa_pc, ih)); return (0); |