 @@ -1,14 +1,14 @@
-/* $NetBSD: vbox_drv.c,v 1.2 2011/08/28 17:18:31 jmcneill Exp $ */
+/* $NetBSD: vbox_drv.c,v 1.3 2017/01/20 12:25:07 maya Exp $ */
 /*
  * Copyright (c) 2011 Jared D. McNeill <jmcneill@invisible.ca>
  * 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. The name of the author may not be used to endorse or promote products
  *    derived from this software without specific prior written permission.
+ *
 @@ -16,27 +16,27 @@
  * 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 AUTHOR 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: vbox_drv.c,v 1.2 2011/08/28 17:18:31 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vbox_drv.c,v 1.3 2017/01/20 12:25:07 maya Exp $");
 #include "drmP.h"
 #include "drm.h"
 static drm_pci_id_list_t vboxdrm_pciidlist[] = {
 	{ 0x80ee, 0xbeef, 0, "VirtualBox Video" },
 	{ 0, 0, 0, NULL },
 };
 static int
 vboxdrm_driver_load(struct drm_device *dev, unsigned long flags)
+{
 	return drm_vblank_init(dev, 1);
 @@ -59,27 +59,28 @@ static int
 vboxdrm_match(device_t parent, cfdata_t match, void *opaque)
+{
 	struct pci_attach_args *pa = opaque;
 	return drm_probe(pa, vboxdrm_pciidlist);
+}
 static void
 vboxdrm_attach(device_t parent, device_t self, void *opaque)
+{
 	struct pci_attach_args *pa = opaque;
 	struct drm_device *dev = device_private(self);
-	pmf_device_register(self, NULL, NULL);
+	if (!pmf_device_register(self, NULL, NULL))
 		aprint_error_dev(self, "couldn't establish power handler\n");
 	dev->driver = kmem_zalloc(sizeof(struct drm_driver_info), KM_SLEEP);
 	if (dev->driver == NULL) {
 		aprint_error_dev(self, "couldn't allocate memory\n");
 		return;
+	}
 	vboxdrm_configure(dev);
 	drm_attach(self, pa, vboxdrm_pciidlist);
+}
 static int
 vboxdrm_detach(device_t self, int flags)

 @@ -1,14 +1,14 @@
-/* $NetBSD: gpiolock.c,v 1.3 2009/12/06 22:33:44 dyoung Exp $ */
+/* $NetBSD: gpiolock.c,v 1.4 2017/01/20 12:25:07 maya Exp $ */
 /*
  * Copyright (c) 2009 Marc Balmer <marc@msys.ch>
  * 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.
 @@ -113,27 +113,28 @@ gpiolock_attach(device_t parent, device_
+		}
 		aprint_normal(" [%d]", sc->sc_map.pm_map[pin]);
 		sc->sc_data = GPIO_PIN_INPUT;
 		gpio_pin_ctl(sc->sc_gpio, &sc->sc_map, pin, sc->sc_data);
+	}
 #ifdef KEYLOCK
 	/* Register keylock */
 	if (keylock_register(self, sc->sc_npins, gpiolock_position)) {
 		aprint_error(": can't register keylock\n");
 		goto fail;
+	}
 #endif
-	pmf_device_register(self, NULL, NULL);
+	if (!pmf_device_register(self, NULL, NULL))
 		aprint_error_dev(self, "couldn't establish power handler\n");
 	aprint_normal("\n");
 	return;
 fail:
 	gpio_pin_unmap(sc->sc_gpio, &sc->sc_map);
+}
 int
 gpiolock_detach(device_t self, int flags)
+{
 	struct gpiolock_softc *sc = device_private(self);

 @@ -1,14 +1,14 @@
-/* $NetBSD: gpiopwm.c,v 1.5 2016/07/14 04:00:45 msaitoh Exp $ */
+/* $NetBSD: gpiopwm.c,v 1.6 2017/01/20 12:25:07 maya Exp $ */
 /*
  * Copyright (c) 2011 Marc Balmer <marc@msys.ch>
  * 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.
 @@ -94,27 +94,28 @@ gpiopwm_attach(device_t parent, device_t
 	const struct sysctlnode *node;
 	sc->sc_dev = self;
 	/* Map pin */
 	sc->sc_gpio = ga->ga_gpio;
 	sc->sc_map.pm_map = sc->_map;
 	if (gpio_pin_map(sc->sc_gpio, ga->ga_offset, ga->ga_mask,
 	    &sc->sc_map)) {
 		aprint_error(": can't map pin\n");
 		return;
+	}
 	aprint_normal(" [%d]", sc->sc_map.pm_map[0]);
-	pmf_device_register(self, NULL, NULL);
+	if (!pmf_device_register(self, NULL, NULL))
 		aprint_error_dev(self, "couldn't establish power handler\n");
 	callout_init(&sc->sc_pulse, CALLOUT_MPSAFE);
 	callout_setfunc(&sc->sc_pulse, gpiopwm_pulse, sc);
 	sysctl_createv(&sc->sc_log, 0, NULL, &node,
 ,
 	    CTLTYPE_NODE, device_xname(sc->sc_dev),
 	    SYSCTL_DESCR("GPIO software PWM"),
 	    NULL, 0, NULL, 0,
 	    CTL_HW, CTL_CREATE, CTL_EOL);
 	if (node == NULL) {
 		aprint_error(": can't create sysctl node\n");

 @@ -1,14 +1,14 @@
-/* $NetBSD: gpiosim.c,v 1.19 2016/07/14 04:00:45 msaitoh Exp $ */
+/* $NetBSD: gpiosim.c,v 1.20 2017/01/20 12:25:07 maya Exp $ */
 /*      $OpenBSD: gpiosim.c,v 1.1 2008/11/23 18:46:49 mbalmer Exp $	*/
 /*
  * Copyright (c) 2007 - 2011, 2013 Marc Balmer <marc@msys.ch>
  * All rights reserved.
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
 @@ -111,27 +111,28 @@ gpiosim_attach(device_t parent, device_t
 	sc->sc_state = 0;
 	/* create controller tag */
 	sc->sc_gpio_gc.gp_cookie = sc;
 	sc->sc_gpio_gc.gp_pin_read = gpiosim_pin_read;
 	sc->sc_gpio_gc.gp_pin_write = gpiosim_pin_write;
 	sc->sc_gpio_gc.gp_pin_ctl = gpiosim_pin_ctl;
 	/* gba.gba_name = "gpio"; */
 	gba.gba_gc = &sc->sc_gpio_gc;
 	gba.gba_pins = sc->sc_gpio_pins;
 	gba.gba_npins = GPIOSIM_NPINS;
-	pmf_device_register(self, NULL, NULL);
+	if (!pmf_device_register(self, NULL, NULL))
 		aprint_error_dev(self, "couldn't establish power handler\n");
         sysctl_createv(&sc->sc_log, 0, NULL, &node,
 ,
             CTLTYPE_NODE, device_xname(sc->sc_dev),
             SYSCTL_DESCR("GPIO simulator"),
             NULL, 0, NULL, 0,
             CTL_HW, CTL_CREATE, CTL_EOL);
         if (node == NULL) {
 		aprint_error(": can't create sysctl node\n");
                 return;
+	}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: gffb.c,v 1.11 2016/07/11 11:31:51 msaitoh Exp $	*/
+/*	$NetBSD: gffb.c,v 1.12 2017/01/20 12:25:07 maya Exp $	*/
 /*
  * Copyright (c) 2013 Michael Lorenz
  * 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.
 @@ -25,27 +25,27 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * A console driver for nvidia geforce graphics controllers
  * tested on macppc only so far, should work on other hardware as long as
  * something sets up a usable graphics mode and sets the right device properties
  * This driver should work with all NV1x hardware but so far it's been tested
  * only on NV11 / GeForce2 MX. Needs testing with more hardware and if
  * successful, PCI IDs need to be added to gffb_match()
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gffb.c,v 1.11 2016/07/11 11:31:51 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gffb.c,v 1.12 2017/01/20 12:25:07 maya Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <sys/lwp.h>
 #include <sys/kauth.h>
 #include <sys/atomic.h>
 #include <dev/videomode/videomode.h>
 #include <dev/pci/pcivar.h>
 @@ -332,27 +332,29 @@ gffb_attach(device_t parent, device_t se
+	}
 	j = 0;
 	rasops_get_cmap(ri, cmap, sizeof(cmap));
 	for (i = 0; i < 256; i++) {
 		sc->sc_cmap_red[i] = cmap[j];
 		sc->sc_cmap_green[i] = cmap[j + 1];
 		sc->sc_cmap_blue[i] = cmap[j + 2];
 		gffb_putpalreg(sc, i, cmap[j], cmap[j + 1], cmap[j + 2]);
 		j += 3;
+	}
 	/* no suspend/resume support yet */
-	pmf_device_register(sc->sc_dev, NULL, NULL);
+	if (!pmf_device_register(sc->sc_dev, NULL, NULL))
 		aprint_error_dev(sc->sc_dev,
 		    "couldn't establish power handler\n");
 	aa.console = is_console;
 	aa.scrdata = &sc->sc_screenlist;
 	aa.accessops = &gffb_accessops;
 	aa.accesscookie = &sc->vd;
 	config_found(sc->sc_dev, &aa, wsemuldisplaydevprint);
 #ifdef GFFB_DEBUG
 	for (i = 0; i < 40; i++) {
 		for (j = 0; j < 40; j++) {
 			gffb_rectfill(sc, i * 20, j * 20, 20, 20,
 			    (i + j ) & 1 ? 0xe0e0e0e0 : 0x03030303);

 @@ -1,14 +1,14 @@
-/* $NetBSD: ibmcd.c,v 1.2 2016/07/14 10:19:06 msaitoh Exp $ */
+/* $NetBSD: ibmcd.c,v 1.3 2017/01/20 12:25:07 maya Exp $ */
 /*
  * Copyright (c) 2012 Marc Balmer <marc@msys.ch>
  * 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.
 @@ -104,27 +104,28 @@ ibmcd_attach(device_t parent, device_t s
 	aprint_naive("\n");
 	memtype = pci_mapreg_type(pa->pa_pc, pa->pa_tag, PCI_MAPREG_START);
 	if (pci_mapreg_map(pa, PCI_MAPREG_START, memtype, 0, &sc->sc_iot,
 	    &sc->sc_ioh, NULL, &sc->sc_iosize)) {
 		aprint_error("\n");
 		aprint_error_dev(self, "PCI %s region not found\n",
 		    memtype == PCI_MAPREG_TYPE_IO ? "I/O" : "memory");
 		return;
+	}
 	aprint_normal(": IBM 4810 BSP cash drawer\n");
 #if (__NetBSD_Version__ >= 600000000)
-	pmf_device_register(self, ibmcd_suspend, ibmcd_resume);
+	if (!pmf_device_register(self, ibmcd_suspend, ibmcd_resume))
 		aprint_error_dev(self, "couldn't establish power handler\n");
 #endif
 	/* Initialize pins array */
 	sc->sc_gpio_pins[PIN_OPEN].pin_num = 0;
 	sc->sc_gpio_pins[PIN_OPEN].pin_caps = GPIO_PIN_OUTPUT;
 	sc->sc_gpio_pins[PIN_STATUS].pin_num = 1;
 	sc->sc_gpio_pins[PIN_STATUS].pin_caps = GPIO_PIN_INPUT;
 	sc->sc_gpio_pins[PIN_CONNECTED].pin_num = 2;
 	sc->sc_gpio_pins[PIN_CONNECTED].pin_caps = GPIO_PIN_INPUT;
 	/* Create controller tag */
 	sc->sc_gpio_gc.gp_cookie = sc;
 	sc->sc_gpio_gc.gp_pin_read = ibmcd_gpio_pin_read;
 	sc->sc_gpio_gc.gp_pin_write = ibmcd_gpio_pin_write;

 @@ -1,14 +1,14 @@
-/*	$$NetBSD: pwdog.c,v 1.9 2016/07/14 10:19:06 msaitoh Exp $ */
+/*	$$NetBSD: pwdog.c,v 1.10 2017/01/20 12:25:07 maya Exp $ */
 /*	$OpenBSD: pwdog.c,v 1.7 2010/04/08 00:23:53 tedu Exp $ */
 /*
  * Copyright (c) 2006, 2011 Marc Balmer <mbalmer@NetBSD.org>
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
 @@ -86,27 +86,28 @@ pwdog_attach(device_t parent, device_t s
 	aprint_naive("\n");
 	memtype = pci_mapreg_type(pa->pa_pc, pa->pa_tag, PCI_MAPREG_START);
 	if (pci_mapreg_map(pa, PCI_MAPREG_START, memtype, 0, &sc->sc_iot,
 	    &sc->sc_ioh, NULL, &sc->sc_iosize)) {
 		aprint_error("\n");
 		aprint_error_dev(self, "PCI %s region not found\n",
 		    memtype == PCI_MAPREG_TYPE_IO ? "I/O" : "memory");
 		return;
+	}
 	aprint_normal("\n");
 	sc->sc_dev = self;
-	pmf_device_register(self, pwdog_suspend, pwdog_resume);
+	if (!pmf_device_register(self, pwdog_suspend, pwdog_resume))
 		aprint_error_dev(self, "couldn't establish power handler\n");
 	bus_space_write_1(sc->sc_iot, sc->sc_ioh, PWDOG_DISABLE, 0);
 	sc->sc_smw.smw_name = device_xname(self);
 	sc->sc_smw.smw_cookie = sc;
 	sc->sc_smw.smw_setmode = pwdog_setmode;
 	sc->sc_smw.smw_tickle = pwdog_tickle;
 	sc->sc_smw.smw_period = PWDOG_MAX_PERIOD;
 	if (sysmon_wdog_register(&sc->sc_smw))
 		aprint_error_dev(self, "couldn't register with sysmon\n");
 	else
 		sc->sc_smw_valid = true;
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: r128fb.c,v 1.39 2015/09/16 16:52:54 macallan Exp $	*/
+/*	$NetBSD: r128fb.c,v 1.40 2017/01/20 12:25:07 maya Exp $	*/
 /*
  * Copyright (c) 2007, 2012 Michael Lorenz
  * 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.
 @@ -21,27 +21,27 @@
  * 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.
  */
 /*
  * A console driver for ATI Rage 128 graphics controllers
  * tested on macppc only so far
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: r128fb.c,v 1.39 2015/09/16 16:52:54 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: r128fb.c,v 1.40 2017/01/20 12:25:07 maya Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <sys/lwp.h>
 #include <sys/kauth.h>
 #include <dev/videomode/videomode.h>
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>
 @@ -322,27 +322,29 @@ r128fb_attach(device_t parent, device_t
+	}
 	j = 0;
 	rasops_get_cmap(ri, cmap, sizeof(cmap));
 	for (i = 0; i < 256; i++) {
 		sc->sc_cmap_red[i] = cmap[j];
 		sc->sc_cmap_green[i] = cmap[j + 1];
 		sc->sc_cmap_blue[i] = cmap[j + 2];
 		r128fb_putpalreg(sc, i, cmap[j], cmap[j + 1], cmap[j + 2]);
 		j += 3;
+	}
 	/* no suspend/resume support yet */
-	pmf_device_register(sc->sc_dev, NULL, NULL);
+	if (!pmf_device_register(sc->sc_dev, NULL, NULL))
 		aprint_error_dev(sc->sc_dev,
 		    "couldn't establish power handler\n");
 	reg = bus_space_read_4(sc->sc_memt, sc->sc_regh, R128_LVDS_GEN_CNTL);
 	DPRINTF("R128_LVDS_GEN_CNTL: %08x\n", reg);
 	if (reg & R128_LVDS_ON) {
 		sc->sc_have_backlight = 1;
 		sc->sc_bl_on = 1;
 		sc->sc_bl_level = 255 -
 		    ((reg & R128_LEVEL_MASK) >> R128_LEVEL_SHIFT);
 		pmf_event_register(sc->sc_dev, PMFE_DISPLAY_BRIGHTNESS_UP,
 		    r128fb_brightness_up, TRUE);
 		pmf_event_register(sc->sc_dev, PMFE_DISPLAY_BRIGHTNESS_DOWN,
 		    r128fb_brightness_down, TRUE);
 		aprint_verbose("%s: LVDS output is active, enabling backlight"

 @@ -1,14 +1,14 @@
-/* $NetBSD: sec.c,v 1.16 2014/01/21 19:50:16 christos Exp $ */
+/* $NetBSD: sec.c,v 1.17 2017/01/20 12:25:07 maya Exp $ */
 /*-
  * Copyright (c) 2000, 2001, 2006 Ben Harris
  * 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.
 @@ -28,27 +28,27 @@
  */
 /*
  * sec.c -- driver for Acorn SCSI expansion cards (AKA30, AKA31, AKA32)
+ *
  * These cards are documented in:
  * Acorn Archimedes 500 series / Acorn R200 series Technical Reference Manual
  * Published by Acorn Computers Limited
  * ISBN 1 85250 086 7
  * Part number 0486,052
  * Issue 1, November 1990
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sec.c,v 1.16 2014/01/21 19:50:16 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sec.c,v 1.17 2017/01/20 12:25:07 maya Exp $");
 #include <sys/param.h>
 #include <sys/buf.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <sys/reboot.h>	/* For bootverbose */
 #include <sys/syslog.h>
 #include <sys/systm.h>
 #include <dev/scsipi/scsi_all.h>
 #include <dev/scsipi/scsipi_all.h>
 #include <dev/scsipi/scsiconf.h>
 @@ -204,27 +204,29 @@ sec_attach(device_t parent, device_t sel
 		bus_space_set_region_2(sc->sc_mod_t, sc->sc_mod_h,
 				       SEC_SRAM, 0, SEC_PAGESIZE / 2);
+	}
 	wd33c93_attach(&sc->sc_sbic);
 	evcnt_attach_dynamic(&sc->sc_intrcnt, EVCNT_TYPE_INTR, NULL,
 	    device_xname(self), "intr");
 	sc->sc_ih = podulebus_irq_establish(pa->pa_ih, IPL_BIO, sec_intr,
 	    sc, &sc->sc_intrcnt);
 	sec_cli(sc);
 	sc->sc_mpr |= SEC_MPR_IE;
 	bus_space_write_1(sc->sc_pod_t, sc->sc_pod_h, SEC_MPR, sc->sc_mpr);
-	pmf_device_register1(sc->sc_sbic.sc_dev, NULL, NULL, sec_shutdown);
+	if (!pmf_device_register1(sc->sc_sbic.sc_dev, NULL, NULL, sec_shutdown))
 		aprint_error_dev(sc->sc_sbic.sc_dev,
 		    "couldn't establish power handler\n");
+}
 /*
  * Before reboot, reset the page register to 0 so that RISC OS can see
  * the podule ROM.
  */
 static bool
 sec_shutdown(device_t dev, int howto)
+{
 	struct sec_softc *sc = device_private(dev);
 	sec_setpage(sc, 0);
 	return true;

 @@ -1,14 +1,14 @@
-/* $NetBSD: irmce.c,v 1.2 2016/04/23 10:15:32 skrll Exp $ */
+/* $NetBSD: irmce.c,v 1.3 2017/01/20 12:25:07 maya Exp $ */
 /*-
  * Copyright (c) 2011 Jared D. McNeill <jmcneill@invisible.ca>
  * 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.
 @@ -21,27 +21,27 @@
  * 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.
  */
 /*
  * IR receiver/transceiver for Windows Media Center
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: irmce.c,v 1.2 2016/04/23 10:15:32 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: irmce.c,v 1.3 2017/01/20 12:25:07 maya Exp $");
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/conf.h>
 #include <sys/bus.h>
 #include <sys/select.h>
 #include <sys/module.h>
 #include <dev/usb/usb.h>
 #include <dev/usb/usbdi.h>
 #include <dev/usb/usbdi_util.h>
 @@ -140,27 +140,28 @@ irmce_match(device_t parent, cfdata_t ma
 	return UMATCH_NONE;
+}
 static void
 irmce_attach(device_t parent, device_t self, void *opaque)
+{
 	struct irmce_softc *sc = device_private(self);
 	struct usbif_attach_arg *uiaa = opaque;
 	usb_endpoint_descriptor_t *ed;
 	char *devinfop;
 	unsigned int i;
 	uint8_t nep;
-	pmf_device_register(self, NULL, NULL);
+	if (!pmf_device_register(self, NULL, NULL))
 		aprint_error_dev(self, "couldn't establish power handler\n");
 	aprint_naive("\n");
 	devinfop = usbd_devinfo_alloc(uiaa->uiaa_device, 0);
 	aprint_normal(": %s\n", devinfop);
 	usbd_devinfo_free(devinfop);
 	sc->sc_dev = self;
 	sc->sc_udev = uiaa->uiaa_device;
 	sc->sc_iface = uiaa->uiaa_iface;
 	nep = 0;
 	usbd_endpoint_count(sc->sc_iface, &nep);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: radeondrmkmsfb.c,v 1.6 2015/11/05 20:52:46 mrg Exp $	*/
+/*	$NetBSD: radeondrmkmsfb.c,v 1.7 2017/01/20 12:25:07 maya Exp $	*/
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Taylor R. Campbell.
+ *
  * 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.
 @@ -21,27 +21,27 @@
  * 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: radeondrmkmsfb.c,v 1.6 2015/11/05 20:52:46 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeondrmkmsfb.c,v 1.7 2017/01/20 12:25:07 maya Exp $");
 #ifdef _KERNEL_OPT
 #include "vga.h"
 #endif
 #include <sys/types.h>
 #include <sys/device.h>
 #include <dev/pci/pciio.h>
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
 #include <dev/pci/wsdisplay_pci.h>
 @@ -201,28 +201,30 @@ radeonfb_setconfig_task(struct radeon_ta
 	genfb_ops.genfb_ioctl = radeonfb_genfb_ioctl;
 	genfb_ops.genfb_mmap = radeonfb_genfb_mmap;
 	genfb_ops.genfb_enable_polling = radeonfb_genfb_enable_polling;
 	genfb_ops.genfb_disable_polling = radeonfb_genfb_disable_polling;
 	error = genfb_attach(&sc->sc_genfb, &genfb_ops);
 	if (error) {
 		aprint_error_dev(sc->sc_dev, "failed to attach genfb: %d\n",
 		    error);
 		goto fail0;
+	}
 	sc->sc_attached = true;
-	pmf_device_register1(sc->sc_dev, NULL, NULL,
+	if (!pmf_device_register1(sc->sc_dev, NULL, NULL,
-	    radeonfb_genfb_shutdown);
+	    radeonfb_genfb_shutdown))
 		aprint_error_dev(sc->sc_dev,
 		    "couldn't establish power handler\n");
 	/* Success!  */
 	sc->sc_scheduled = false;
 	return;
 fail0:	/* XXX Restore console...  */
 	switch (what_was_cons) {
 	case CONS_VGA:
 		break;
 	case CONS_GENFB:
 		break;
 	case CONS_NONE:
 		break;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: lua.c,v 1.18 2016/07/14 04:00:46 msaitoh Exp $ */
+/*	$NetBSD: lua.c,v 1.19 2017/01/20 12:25:07 maya Exp $ */
 /*
  * Copyright (c) 2014 by Lourival Vieira Neto <lneto@NetBSD.org>.
  * Copyright (c) 2011 - 2014 by Marc Balmer <mbalmer@NetBSD.org>.
  * 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
 @@ -131,27 +131,28 @@ lua_attach(device_t parent, device_t sel
 	if (sc_self)
 		return;
 	sc = device_private(self);
 	sc->sc_dev = self;
 	sc_self = self;
 	mutex_init(&sc->sc_lock, MUTEX_DEFAULT, IPL_VM);
 	cv_init(&sc->sc_inuse_cv, "luactl");
 	mutex_init(&sc->sc_state_lock, MUTEX_DEFAULT, IPL_VM);
 	cv_init(&sc->sc_state_cv, "luastate");
-	pmf_device_register(self, NULL, NULL);
+	if (!pmf_device_register(self, NULL, NULL))
 		aprint_error_dev(self, "couldn't establish power handler\n");
 	/* Sysctl to provide some control over behaviour */
         sysctl_createv(&sc->sc_log, 0, NULL, &node,
             CTLFLAG_OWNDESC,
             CTLTYPE_NODE, "lua",
             SYSCTL_DESCR("Lua options"),
             NULL, 0, NULL, 0,
             CTL_KERN, CTL_CREATE, CTL_EOL);
         if (node == NULL) {
 		aprint_error(": can't create sysctl node\n");
                 return;
+	}

	@@ -188,27 +188,28 @@ i915drm_probe(device_t parent, cfdata_t		@@ -188,27 +188,28 @@ i915drm_probe(device_t parent, cfdata_t
188	}	188	}
189		189
190	static void	190	static void
191	i915drm_attach(device_t parent, device_t self, void *aux)	191	i915drm_attach(device_t parent, device_t self, void *aux)
192	{	192	{
193	struct pci_attach_args *pa = aux;	193	struct pci_attach_args *pa = aux;
194	struct drm_device *dev = device_private(self);	194	struct drm_device *dev = device_private(self);
195		195
196	dev->driver = malloc(sizeof(struct drm_driver_info), DRM_MEM_DRIVER,	196	dev->driver = malloc(sizeof(struct drm_driver_info), DRM_MEM_DRIVER,
197	M_WAITOK \| M_ZERO);	197	M_WAITOK \| M_ZERO);
198		198
199	i915_configure(dev);	199	i915_configure(dev);
200		200
201	pmf_device_register(self, i915drm_suspend, i915drm_resume);	201	if (!pmf_device_register(self, i915drm_suspend, i915drm_resume))
		202	aprint_error_dev(self, "couldn't establish power handler\n");
202		203
203	drm_attach(self, pa, i915_pciidlist);	204	drm_attach(self, pa, i915_pciidlist);
204	}	205	}
205		206
206	static int	207	static int
207	i915drm_detach(device_t self, int flags)	208	i915drm_detach(device_t self, int flags)
208	{	209	{
209	pmf_device_deregister(self);	210	pmf_device_deregister(self);
210		211
211	return drm_detach(self, flags);	212	return drm_detach(self, flags);
212	}	213	}
213		214
214	CFATTACH_DECL_NEW(i915drm, sizeof(struct drm_device), i915drm_probe,	215	CFATTACH_DECL_NEW(i915drm, sizeof(struct drm_device), i915drm_probe,