 @@ -1,14 +1,14 @@
-/*	$NetBSD: intelfb.c,v 1.4 2014/07/24 21:45:03 riastradh Exp $	*/
+/*	$NetBSD: intelfb.c,v 1.5 2014/07/25 16:35:43 riastradh 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.
 @@ -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: intelfb.c,v 1.4 2014/07/24 21:45:03 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intelfb.c,v 1.5 2014/07/25 16:35:43 riastradh Exp $");
 #ifdef _KERNEL_OPT
 #include "vga.h"
 #endif
 #include <sys/types.h>
 #include <sys/bus.h>
 #include <sys/device.h>
 #include <dev/pci/pciio.h>
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
 @@ -104,26 +104,29 @@ intelfb_match(device_t parent, cfdata_t
 static void
 intelfb_attach(device_t parent, device_t self, void *aux)
+{
 	struct intelfb_softc *const sc = device_private(self);
 	const struct intelfb_attach_args *const ifa = aux;
 	int error;
 	sc->sc_dev = self;
 	sc->sc_ifa = *ifa;
 	sc->sc_mapped = false;
 	sc->sc_scheduled = false;
 	sc->sc_attached = false;
 	aprint_naive("\n");
 	aprint_normal("\n");
 	/* XXX Defer this too?  */
 	error = bus_space_map(ifa->ifa_fb_bst, ifa->ifa_fb_addr,
 	    ifa->ifa_fb_size,
 	    (BUS_SPACE_MAP_LINEAR | BUS_SPACE_MAP_PREFETCHABLE),
 	    &sc->sc_fb_bsh);
 	if (error) {
 		aprint_error_dev(self, "unable to map framebuffer: %d\n",
 		    error);
 		goto fail0;
+	}
 	sc->sc_mapped = true;
 	i915drmkms_task_init(&sc->sc_setconfig_task, &intelfb_setconfig_task);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: radeondrmkmsfb.c,v 1.1 2014/07/25 12:35:03 riastradh Exp $	*/
+/*	$NetBSD: radeondrmkmsfb.c,v 1.2 2014/07/25 16:35:43 riastradh 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.1 2014/07/25 12:35:03 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeondrmkmsfb.c,v 1.2 2014/07/25 16:35:43 riastradh 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>
 @@ -101,26 +101,29 @@ radeonfb_match(device_t parent, cfdata_t
 static void
 radeonfb_attach(device_t parent, device_t self, void *aux)
+{
 	struct radeonfb_softc *const sc = device_private(self);
 	const struct radeonfb_attach_args *const rfa = aux;
 	int error;
 	sc->sc_dev = self;
 	sc->sc_rfa = *rfa;
 	sc->sc_scheduled = false;
 	sc->sc_attached = false;
 	aprint_naive("\n");
 	aprint_normal("\n");
 	radeon_task_init(&sc->sc_setconfig_task, &radeonfb_setconfig_task);
 	error = radeon_task_schedule(parent, &sc->sc_setconfig_task);
 	if (error) {
 		aprint_error_dev(self, "failed to schedule mode set: %d\n",
 		    error);
 		goto fail0;
+	}
 	sc->sc_scheduled = true;
 	/* Success!  */
 	return;
 fail0:	return;