diff options
author | brian <brian@FreeBSD.org> | 2001-05-08 07:55:33 +0000 |
---|---|---|
committer | brian <brian@FreeBSD.org> | 2001-05-08 07:55:33 +0000 |
commit | b824fbe47c8163384ff2c1dac26ce3fdeab77aca (patch) | |
tree | f722856d174f6b63a19d395e52f942d645988342 /sys/dev/digi/digi_pci.c | |
parent | d8ef9cc3b5b9f5e2ab6ca2d6250d97259e791511 (diff) | |
download | FreeBSD-src-b824fbe47c8163384ff2c1dac26ce3fdeab77aca.zip FreeBSD-src-b824fbe47c8163384ff2c1dac26ce3fdeab77aca.tar.gz |
Remove all the mutex stuff - suggested by jhb
Tidy up includes, credit Slawa Olhovchenkov, John Prince and Eric Hernes
for their efforts and add a couple of missing parenthesis around return
expressions.
Diffstat (limited to 'sys/dev/digi/digi_pci.c')
-rw-r--r-- | sys/dev/digi/digi_pci.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sys/dev/digi/digi_pci.c b/sys/dev/digi/digi_pci.c index cad061e..859f435 100644 --- a/sys/dev/digi/digi_pci.c +++ b/sys/dev/digi/digi_pci.c @@ -1,5 +1,8 @@ /*- * Copyright (c) 2001 Brian Somers <brian@Awfulhak.org> + * based on work by Slawa Olhovchenkov + * John Prince <johnp@knight-trosoft.com> + * Eric Hernes * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -31,7 +34,6 @@ #include <sys/systm.h> #include <sys/kernel.h> #include <sys/tty.h> -#include <sys/syslog.h> #include <sys/bus.h> #include <machine/bus.h> #include <sys/rman.h> @@ -39,7 +41,6 @@ #include <vm/vm.h> #include <vm/pmap.h> #include <pci/pcivar.h> -#include <sys/mutex.h> #include <digi/digireg.h> #include <digi/digiio.h> @@ -88,10 +89,10 @@ digi_pci_probe(device_t dev) case PCI_DEVICE_920_4: case PCI_DEVICE_920_8: case PCI_DEVICE_920_2: - return 0; + return (0); } - return ENXIO; + return (ENXIO); } static int @@ -184,7 +185,7 @@ digi_pci_attach(device_t dev) 0, ~0, 1, RF_SHAREABLE | RF_ACTIVE); if (sc->res.irq == NULL) { device_printf(dev, "couldn't map interrupt\n"); - return ENXIO; + return (ENXIO); } retVal = bus_setup_intr(dev, sc->res.irq, INTR_TYPE_TTY, digiintr, sc, &sc->res.irqHandler); |