 @@ -1,14 +1,14 @@
-/* $NetBSD: ifpci.c,v 1.29 2009/11/26 15:17:10 njoly Exp $	*/
+/* $NetBSD: ifpci.c,v 1.30 2009/12/06 23:14:05 dyoung Exp $	*/
 /*
  *   Copyright (c) 1999 Gary Jennejohn. All rights reserved.
+ *
  *   Redistribution and use in source and binary forms, with or without
  *   modification, are permitted provided that the following conditions
  *   are met:
+ *
  *   1. Redistributions of source code must retain the above copyright
  *      notice, this list of conditions and the following disclaimer.
  *   2. Redistributions in binary form must reproduce the above copyright
  *      notice, this list of conditions and the following disclaimer in the
  *      documentation and/or other materials provided with the distribution.
  *   3. Neither the name of the author nor the names of any co-contributors
 @@ -26,34 +26,34 @@
  *   OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  *   HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  *   LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  *   OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  *   SUCH DAMAGE.
+ *
  *---------------------------------------------------------------------------
  *   a lot of code was borrowed from i4b_bchan.c and i4b_hscx.c
  *---------------------------------------------------------------------------
+ *
  *	Fritz!Card PCI driver
  *	------------------------------------------------
+ *
- *	$Id: ifpci.c,v 1.29 2009/11/26 15:17:10 njoly Exp $
+ *	$Id: ifpci.c,v 1.30 2009/12/06 23:14:05 dyoung Exp $
+ *
  *      last edit-date: [Fri Jan  5 11:38:58 2001]
+ *
  *---------------------------------------------------------------------------*/
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ifpci.c,v 1.29 2009/11/26 15:17:10 njoly Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ifpci.c,v 1.30 2009/12/06 23:14:05 dyoung Exp $");
 #include <sys/param.h>
 #include <sys/ioctl.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/bus.h>
 #include <sys/device.h>
 #include <sys/socket.h>
 #include <net/if.h>
 @@ -402,43 +402,37 @@ ifpci_detach(device_t self, int flags)
 	struct ifpci_softc *psc = device_private(self);
 	bus_space_unmap(psc->sc_isic.sc_maps[0].t, psc->sc_isic.sc_maps[0].h, psc->sc_size);
 	bus_space_free(psc->sc_isic.sc_maps[0].t, psc->sc_isic.sc_maps[0].h, psc->sc_size);
 	pci_intr_disestablish(psc->sc_pc, psc->sc_ih);
 	return (0);
+}
 int
 ifpci_activate(device_t self, enum devact act)
+{
 	struct ifpci_softc *psc = device_private(self);
 	int error = 0, s;
 	s = splnet();
 	switch (act) {
 	case DVACT_ACTIVATE:
 		error = EOPNOTSUPP;
 		break;
 	case DVACT_DEACTIVATE:
 		psc->sc_isic.sc_intr_valid = ISIC_INTR_DYING;
 		isdn_layer2_status_ind(&psc->sc_isic.sc_l2, psc->sc_isic.sc_l3token, STI_ATTACH, 0);
 		isdn_detach_isdnif(psc->sc_isic.sc_l3token);
 		psc->sc_isic.sc_l3token = NULL;
-		break;
+		return 0;
 	default:
 		return EOPNOTSUPP;
+	}
 	splx(s);
 	return (error);
+}
 /*---------------------------------------------------------------------------*
  *	AVM read fifo routines
  *---------------------------------------------------------------------------*/
 static void
 avma1pp_read_fifo(struct isic_softc *sc, int what, void *buf, size_t size)
+{
 	switch (what) {
 		case ISIC_WHAT_ISAC:
 			bus_space_write_1(sc->sc_maps[0].t, sc->sc_maps[0].h,  ADDR_REG_OFFSET, ISAC_FIFO);
 			bus_space_read_multi_1(sc->sc_maps[0].t, sc->sc_maps[0].h,  ISAC_REG_OFFSET, buf, size);

 @@ -1,14 +1,14 @@
-/* $NetBSD: ifpci2.c,v 1.18 2009/11/26 15:17:10 njoly Exp $	*/
+/* $NetBSD: ifpci2.c,v 1.19 2009/12/06 23:14:05 dyoung Exp $	*/
 /*
  *   Copyright (c) 1999 Gary Jennejohn. All rights reserved.
+ *
  *   Redistribution and use in source and binary forms, with or without
  *   modification, are permitted provided that the following conditions
  *   are met:
+ *
  *   1. Redistributions of source code must retain the above copyright
  *      notice, this list of conditions and the following disclaimer.
  *   2. Redistributions in binary form must reproduce the above copyright
  *      notice, this list of conditions and the following disclaimer in the
  *      documentation and/or other materials provided with the distribution.
  *   3. Neither the name of the author nor the names of any co-contributors
 @@ -26,34 +26,34 @@
  *   OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  *   HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  *   LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  *   OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  *   SUCH DAMAGE.
+ *
  *---------------------------------------------------------------------------
  *   a lot of code was borrowed from i4b_bchan.c and i4b_hscx.c
  *---------------------------------------------------------------------------
+ *
  *	Fritz!Card PCI driver
  *	------------------------------------------------
+ *
- *	$Id: ifpci2.c,v 1.18 2009/11/26 15:17:10 njoly Exp $
+ *	$Id: ifpci2.c,v 1.19 2009/12/06 23:14:05 dyoung Exp $
+ *
  *      last edit-date: [Fri Jan  5 11:38:58 2001]
+ *
  *---------------------------------------------------------------------------*/
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ifpci2.c,v 1.18 2009/11/26 15:17:10 njoly Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ifpci2.c,v 1.19 2009/12/06 23:14:05 dyoung Exp $");
 #include <sys/param.h>
 #include <sys/ioctl.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/bus.h>
 #include <sys/device.h>
 #include <sys/socket.h>
 #include <net/if.h>
 @@ -361,43 +361,37 @@ ifpci2_detach(device_t self, int flags)
 	struct ifpci_softc *psc = device_private(self);
 	bus_space_unmap(psc->sc_isic.sc_maps[0].t, psc->sc_isic.sc_maps[0].h, psc->sc_size);
 	bus_space_free(psc->sc_isic.sc_maps[0].t, psc->sc_isic.sc_maps[0].h, psc->sc_size);
 	pci_intr_disestablish(psc->sc_pc, psc->sc_ih);
 	return (0);
+}
 int
 ifpci2_activate(device_t self, enum devact act)
+{
 	struct ifpci_softc *psc = device_private(self);
 	int error = 0, s;
 	s = splnet();
 	switch (act) {
 	case DVACT_ACTIVATE:
 		error = EOPNOTSUPP;
 		break;
 	case DVACT_DEACTIVATE:
 		psc->sc_isic.sc_intr_valid = ISIC_INTR_DYING;
 		isdn_layer2_status_ind(&psc->sc_isic.sc_l2, psc->sc_isic.sc_l3token, STI_ATTACH, 0);
 		isdn_detach_isdnif(psc->sc_isic.sc_l3token);
 		psc->sc_isic.sc_l3token = NULL;
-		break;
+		return 0;
 	default:
 		return EOPNOTSUPP;
+	}
 	splx(s);
 	return (error);
+}
 /*---------------------------------------------------------------------------*
  *	AVM read fifo routines
  *---------------------------------------------------------------------------*/
 static void
 avma1pp2_read_fifo(struct isic_softc *sc, int what, void *buf, size_t size)
+{
 	int	i;
 	switch (what) {
 		case ISIC_WHAT_ISAC:

 @@ -1,14 +1,14 @@
-/* $NetBSD: isic_pci.c,v 1.36 2009/11/26 15:17:10 njoly Exp $ */
+/* $NetBSD: isic_pci.c,v 1.37 2009/12/06 23:14:05 dyoung Exp $ */
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Martin Husemann <martin@NetBSD.org>.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -20,27 +20,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isic_pci.c,v 1.36 2009/11/26 15:17:10 njoly Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isic_pci.c,v 1.37 2009/12/06 23:14:05 dyoung Exp $");
 #include <sys/param.h>
 #include <sys/errno.h>
 #include <sys/syslog.h>
 #include <sys/device.h>
 #include <sys/socket.h>
 #include <net/if.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/callout.h>
 #include <sys/cpu.h>
 #include <sys/intr.h>
 @@ -303,29 +303,23 @@ isic_pci_detach(device_t self, int flags
 	struct pci_isic_softc *psc = device_private(self);
 	bus_space_unmap(psc->sc_isic.sc_maps[0].t, psc->sc_isic.sc_maps[0].h, psc->sc_size);
 	bus_space_free(psc->sc_isic.sc_maps[0].t, psc->sc_isic.sc_maps[0].h, psc->sc_size);
 	pci_intr_disestablish(psc->sc_pc, psc->sc_ih);
 	return (0);
+}
 static int
 isic_pci_activate(device_t self, enum devact act)
+{
 	struct pci_isic_softc *psc = device_private(self);
 	int error = 0, s;
 	s = splnet();
 	switch (act) {
 	case DVACT_ACTIVATE:
 		error = EOPNOTSUPP;
 		break;
 	case DVACT_DEACTIVATE:
 		psc->sc_isic.sc_intr_valid = ISIC_INTR_DYING;
 		isic_detach_bri(&psc->sc_isic);
-		break;
+		return 0;
 	default:
 		return EOPNOTSUPP;
+	}
 	splx(s);
 	return (error);
+}