 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_an_pci.c,v 1.29 2009/05/06 10:34:32 cegger Exp $	*/
+/*	$NetBSD: if_an_pci.c,v 1.30 2009/09/05 14:13:50 tsutsui Exp $	*/
 /*
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Atsushi Onoe.
+ *
  * 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.
 @@ -26,27 +26,27 @@
  * 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.
  */
 /*
  * PCI bus front-end for the Aironet PC4500/PC4800 Wireless LAN Adapter.
  * Unlike WaveLAN, this adapter attached as PCI device using a PLX 9050
  * PCI to "dumb bus" bridge chip.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_an_pci.c,v 1.29 2009/05/06 10:34:32 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_an_pci.c,v 1.30 2009/09/05 14:13:50 tsutsui Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <sys/errno.h>
 #include <sys/device.h>
 #include <sys/callout.h>
 #include <machine/endian.h>
 @@ -158,18 +158,18 @@ an_pci_attach(device_t parent, device_t
 			aprint_normal(" at %s", intrstr);
 		aprint_normal("\n");
 		return;
+	}
 	aprint_normal_dev(self, "interrupting at %s\n", intrstr);
 	sc->sc_enabled = 1;
 	if (an_attach(sc) != 0) {
 		aprint_error_dev(self, "failed to attach controller\n");
 		pci_intr_disestablish(pa->pa_pc, psc->sc_ih);
 		bus_space_unmap(sc->sc_iot, sc->sc_ioh, iosize);
+	}
-	if (!pmf_device_register(self, NULL, NULL))
+	if (pmf_device_register(self, NULL, NULL))
 		aprint_error_dev(self, "couldn't establish power handler\n");
 	else
 		pmf_class_network_register(self, &sc->sc_if);
 	else
 		aprint_error_dev(self, "couldn't establish power handler\n");
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_ath_pci.c,v 1.33 2009/05/06 09:25:15 cegger Exp $	*/
+/*	$NetBSD: if_ath_pci.c,v 1.34 2009/09/05 14:13:50 tsutsui Exp $	*/
 /*-
  * Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
  * 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,
  *    without modification.
  * 2. Redistributions in binary form must reproduce at minimum a disclaimer
  *    similar to the "NO WARRANTY" disclaimer below ("Disclaimer") and any
 @@ -31,27 +31,27 @@
  * 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 DAMAGES.
  */
 #include <sys/cdefs.h>
 #ifdef __FreeBSD__
 __FBSDID("$FreeBSD: src/sys/dev/ath/if_ath_pci.c,v 1.11 2005/01/18 18:08:16 sam Exp $");
 #endif
 #ifdef __NetBSD__
-__KERNEL_RCSID(0, "$NetBSD: if_ath_pci.c,v 1.33 2009/05/06 09:25:15 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ath_pci.c,v 1.34 2009/09/05 14:13:50 tsutsui Exp $");
 #endif
 /*
  * PCI/Cardbus front-end for the Atheros Wireless LAN controller driver.
  */
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
 #include <sys/errno.h>
 @@ -250,32 +250,31 @@ ath_pci_attach(device_t parent, device_t
 		goto bad2;
+	}
 	aprint_normal("\n");
 	aprint_verbose_dev(self, "interrupting at %s\n", intrstr);
 	sc->sc_dmat = pa->pa_dmat;
 	ATH_LOCK_INIT(sc);
 	if (ath_attach(PCI_PRODUCT(pa->pa_id), sc) != 0)
 		goto bad3;
-	if (!pmf_device_register(self, ath_pci_suspend, ath_pci_resume))
+	if (pmf_device_register(self, ath_pci_suspend, ath_pci_resume)) {
 		aprint_error_dev(self, "couldn't establish power handler\n");
 	else {
 		pmf_class_network_register(self, &sc->sc_if);
 		pmf_device_suspend_self(self);
 	} else
 		aprint_error_dev(self, "couldn't establish power handler\n");
 	return;
 bad3:
 	ATH_LOCK_DESTROY(sc);
 	pci_intr_disestablish(pc, psc->sc_ih);
 bad2:	/* XXX */
 bad1:
 	bus_space_unmap(psc->sc_iot, psc->sc_ioh, psc->sc_mapsz);
 bad:	/* XXX */
 	return;
+}
 static int

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_fxp_pci.c,v 1.69 2009/04/17 15:37:43 tsutsui Exp $	*/
+/*	$NetBSD: if_fxp_pci.c,v 1.70 2009/09/05 14:13:50 tsutsui Exp $	*/
 /*-
  * Copyright (c) 1997, 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center.
+ *
  * 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
 @@ -26,27 +26,27 @@
  * 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.
  */
 /*
  * PCI bus front-end for the Intel i82557 fast Ethernet controller
  * driver.  Works with Intel Etherexpress Pro 10+, 100B, 100+ cards.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_fxp_pci.c,v 1.69 2009/04/17 15:37:43 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_fxp_pci.c,v 1.70 2009/09/05 14:13:50 tsutsui Exp $");
 #include "rnd.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <sys/errno.h>
 #include <sys/device.h>
 @@ -472,30 +472,30 @@ fxp_pci_attach(device_t parent, device_t
 		if (intrstr != NULL)
 			aprint_normal(" at %s", intrstr);
 		aprint_normal("\n");
 		return;
+	}
 	aprint_normal_dev(self, "interrupting at %s\n", intrstr);
 	/* Finish off the attach. */
 	fxp_attach(sc);
 	if (sc->sc_disable != NULL)
 		fxp_disable(sc);
 	/* Add a suspend hook to restore PCI config state */
-	if (!pmf_device_register(self, NULL, fxp_pci_resume))
+	if (pmf_device_register(self, NULL, fxp_pci_resume))
 		aprint_error_dev(self, "couldn't establish power handler\n");
 	else
 		pmf_class_network_register(self, &sc->sc_ethercom.ec_if);
 	else
 		aprint_error_dev(self, "couldn't establish power handler\n");
+}
 static int
 fxp_pci_enable(struct fxp_softc *sc)
+{
 	struct fxp_pci_softc *psc = (void *) sc;
 #if 0
 	printf("%s: going to power state D0\n", device_xname(self));
 #endif
 	/* Bring the device into D0 power state. */
 	pci_conf_write(psc->psc_pc, psc->psc_tag,

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_gem_pci.c,v 1.36 2009/07/27 18:10:53 dyoung Exp $ */
+/*	$NetBSD: if_gem_pci.c,v 1.37 2009/09/05 14:13:50 tsutsui Exp $ */
 /*
+ *
  * Copyright (C) 2001 Eduardo Horvath.
  * 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
 @@ -24,27 +24,27 @@
  * 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.
+ *
  */
 /*
  * PCI bindings for Apple GMAC, Sun ERI and Sun GEM Ethernet controllers
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_gem_pci.c,v 1.36 2009/07/27 18:10:53 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_gem_pci.c,v 1.37 2009/09/05 14:13:50 tsutsui Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
 #include <sys/errno.h>
 #include <sys/device.h>
 #include <machine/endian.h>
 #include <uvm/uvm_extern.h>
 @@ -389,32 +389,32 @@ gem_pci_attach(device_t parent, device_t
 #endif /* macppc */
 #endif /* __sparc__ */
 	if (pci_intr_map(pa, &gsc->gsc_handle) != 0) {
 		aprint_error_dev(sc->sc_dev, "unable to map interrupt\n");
 		return;
+	}
 	gsc->gsc_pc = pa->pa_pc;
 	gem_pci_estintr(gsc);
 	/* Finish off the attach. */
 	gem_attach(sc, enaddr);
-	if (!pmf_device_register1(sc->sc_dev, gem_pci_suspend, gem_pci_resume,
+	if (pmf_device_register1(sc->sc_dev,
-	                          gem_shutdown)) {
+	    gem_pci_suspend, gem_pci_resume, gem_shutdown))
 		pmf_class_network_register(sc->sc_dev, &sc->sc_ethercom.ec_if);
 	else
 		aprint_error_dev(sc->sc_dev,
 		    "could not establish power handlers\n");
 	} else
 		pmf_class_network_register(sc->sc_dev, &sc->sc_ethercom.ec_if);
+}
 static bool
 gem_pci_suspend(device_t self PMF_FN_ARGS)
+{
 	struct gem_pci_softc *gsc = device_private(self);
 	if (gsc->gsc_ih != NULL) {
 		pci_intr_disestablish(gsc->gsc_pc, gsc->gsc_ih);
 		gsc->gsc_ih = NULL;
+	}
 	return true;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_rtk_pci.c,v 1.38 2009/05/06 09:25:16 cegger Exp $	*/
+/*	$NetBSD: if_rtk_pci.c,v 1.39 2009/09/05 14:13:50 tsutsui Exp $	*/
 /*
  * Copyright (c) 1997, 1998
  *	Bill Paul <wpaul@ctr.columbia.edu>.  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.
 @@ -37,27 +37,27 @@
 /*
  * Realtek 8129/8139 PCI NIC driver
+ *
  * Supports several extremely cheap PCI 10/100 adapters based on
  * the Realtek chipset. Datasheets can be obtained from
  * www.realtek.com.tw.
+ *
  * Written by Bill Paul <wpaul@ctr.columbia.edu>
  * Electrical Engineering Department
  * Columbia University, New York City
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_rtk_pci.c,v 1.38 2009/05/06 09:25:16 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_rtk_pci.c,v 1.39 2009/09/05 14:13:50 tsutsui Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/callout.h>
 #include <sys/device.h>
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
 #include <net/if.h>
 #include <net/if_arp.h>
 @@ -215,20 +215,20 @@ rtk_pci_attach(device_t parent, device_t
 			aprint_normal(" at %s", intrstr);
 		aprint_normal("\n");
 		return;
+	}
 	if (t->rtk_basetype == RTK_8129)
 		sc->sc_quirk |= RTKQ_8129;
 	aprint_normal_dev(self, "interrupting at %s\n", intrstr);
 	sc->sc_dmat = pa->pa_dmat;
 	sc->sc_flags |= RTK_ENABLED;
-	if (!pmf_device_register(self, NULL, NULL))
+	if (pmf_device_register(self, NULL, NULL))
 		aprint_error_dev(self, "couldn't establish power handler\n");
 	else
 		pmf_class_network_register(self, &sc->ethercom.ec_if);
 	else
 		aprint_error_dev(self, "couldn't establish power handler\n");
 	rtk_attach(sc);
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_rtw_pci.c,v 1.13 2009/05/06 09:25:16 cegger Exp $	*/
+/*	$NetBSD: if_rtw_pci.c,v 1.14 2009/09/05 14:13:50 tsutsui Exp $	*/
 /*-
  * Copyright (c) 1998, 1999, 2000, 2002 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center; Charles M. Hannum; and David Young.
+ *
  * 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
 @@ -29,27 +29,27 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * PCI bus front-end for the Realtek RTL8180 802.11 MAC/BBP chip.
+ *
  * Derived from the ADMtek ADM8211 PCI bus front-end.
+ *
  * Derived from the ``Tulip'' PCI bus front-end.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_rtw_pci.c,v 1.13 2009/05/06 09:25:16 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_rtw_pci.c,v 1.14 2009/09/05 14:13:50 tsutsui Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <sys/errno.h>
 #include <sys/device.h>
 #include <machine/endian.h>
 @@ -241,37 +241,35 @@ rtw_pci_attach(device_t parent, device_t
 		if (intrstr != NULL)
 			aprint_error(" at %s", intrstr);
 		aprint_error("\n");
 		return;
+	}
 	aprint_normal_dev(self, "interrupting at %s\n", intrstr);
 	/*
 	 * Finish off the attach.
 	 */
 	rtw_attach(sc);
-	if (!pmf_device_register(sc->sc_dev, rtw_pci_suspend,
+	if (pmf_device_register(sc->sc_dev, rtw_pci_suspend, rtw_pci_resume)) {
 	                         rtw_pci_resume)) {
 		aprint_error_dev(sc->sc_dev,
 		    "couldn't establish power handler\n");
 	} else {
 		pmf_class_network_register(self, &sc->sc_if);
 		/*
 		 * Power down the socket.
 		 */
 		pmf_device_suspend_self(self);
 	} else
 		aprint_error_dev(sc->sc_dev,
 		    "couldn't establish power handler\n");
+}
 static int
 rtw_pci_detach(device_t self, int flags)
+{
 	struct rtw_pci_softc *psc = device_private(self);
 	struct rtw_softc *sc = &psc->psc_rtw;
 	struct rtw_regs *regs = &sc->sc_regs;
 	int rc;
 	if ((rc = rtw_detach(sc)) != 0)
 		return rc;
 	if (psc->psc_intrcookie != NULL)

 @@ -1,14 +1,14 @@
-/*      $NetBSD: if_wi_pci.c,v 1.48 2009/05/12 08:23:01 cegger Exp $  */
+/*      $NetBSD: if_wi_pci.c,v 1.49 2009/09/05 14:13:50 tsutsui Exp $  */
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Hideaki Imaizumi <hiddy@sfc.wide.ad.jp>
  * and Ichiro FUKUHARA (ichiro@ichiro.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
 @@ -26,27 +26,27 @@
  * 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.
  */
 /*
  * PCI bus front-end for the Intersil PCI WaveLan.
  * Works with Prism2.5 Mini-PCI wavelan.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wi_pci.c,v 1.48 2009/05/12 08:23:01 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wi_pci.c,v 1.49 2009/09/05 14:13:50 tsutsui Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/syslog.h>
 #include <sys/socket.h>
 #include <sys/device.h>
 #include <sys/callout.h>
 #include <net/if.h>
 #include <net/if_ether.h>
 #include <net/if_media.h>
 @@ -363,18 +363,18 @@ wi_pci_attach(device_t parent, device_t
+	}
 	printf("%s:", device_xname(self));
 	if (wi_attach(sc, 0) != 0) {
 		aprint_error_dev(self, "failed to attach controller\n");
 		pci_intr_disestablish(pa->pa_pc, sc->sc_ih);
 		return;
+	}
 	if (!wpp->wpp_chip)
 		sc->sc_reset = wi_pci_reset;
-	if (!pmf_device_register(self, NULL, NULL))
+	if (pmf_device_register(self, NULL, NULL))
 		aprint_error_dev(self, "couldn't establish power handler\n");
 	else
 		pmf_class_network_register(self, &sc->sc_if);
 	else
 		aprint_error_dev(self, "couldn't establish power handler\n");
+}