 @@ -1,14 +1,14 @@
-/* $NetBSD: video.c,v 1.44 2022/03/03 06:22:23 riastradh Exp $ */
+/* $NetBSD: video.c,v 1.45 2022/03/03 06:23:25 riastradh Exp $ */
 /*
  * Copyright (c) 2008 Patrick Mahoney <pat@polycrystal.org>
  * All rights reserved.
+ *
  * This code was written by Patrick Mahoney (pat@polycrystal.org) as
  * part of Google Summer of Code 2008.
+ *
  * 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.
  */
 /*
  * This ia a Video4Linux 2 compatible /dev/video driver for NetBSD
+ *
  * See http://v4l2spec.bytesex.org/ for Video4Linux 2 specifications
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: video.c,v 1.44 2022/03/03 06:22:23 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: video.c,v 1.45 2022/03/03 06:23:25 riastradh Exp $");
 #include "video.h"
 #if NVIDEO > 0
 #include <sys/param.h>
 #include <sys/ioctl.h>
 #include <sys/fcntl.h>
 #include <sys/vnode.h>
 #include <sys/poll.h>
 #include <sys/select.h>
 #include <sys/kmem.h>
 #include <sys/pool.h>
 #include <sys/conf.h>
 @@ -418,39 +418,27 @@ video_print(void *aux, const char *pnp)
 		aprint_normal("%s at %s\n", "video", pnp);
 	} else {
 		DPRINTF(("video_print: pnp is NULL\n"));
+	}
 	return UNCONF;
+}
 /*
  * Called from hardware driver.  This is where the MI audio driver
  * gets probed/attached to the hardware driver.
  */
 device_t
-video_attach_mi(const struct video_hw_if *hw_if, device_t parent)
+video_attach_mi(const struct video_hw_if *hw_if, device_t parent, void *sc)
 	struct video_attach_args args;
 	args.hw_if = hw_if;
 	args.hw_softc = device_private(parent);
 	return config_found(parent, &args, video_print,
 	    CFARGS(.iattr = "videobus"));
 device_t
 video_attach_mi_softc(const struct video_hw_if *hw_if, device_t parent,
     void *sc)
+{
 	struct video_attach_args args;
 	args.hw_if = hw_if;
 	args.hw_softc = sc;
 	return config_found(parent, &args, video_print,
 	    CFARGS(.iattr = "videobus"));
+}
 /* video_submit_payload - called by hardware driver to submit payload data */
 void
 video_submit_payload(device_t self, const struct video_payload *payload)
+{

 @@ -1,14 +1,14 @@
-/* $NetBSD: video_if.h,v 1.10 2022/03/03 06:22:23 riastradh Exp $ */
+/* $NetBSD: video_if.h,v 1.11 2022/03/03 06:23:25 riastradh Exp $ */
 /*
  * Copyright (c) 2008 Patrick Mahoney <pat@polycrystal.org>
  * All rights reserved.
+ *
  * This code was written by Patrick Mahoney (pat@polycrystal.org) as
  * part of Google Summer of Code 2008.
+ *
  * 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.
 @@ -494,18 +494,17 @@ struct video_hw_if {
 	int	(*get_frequency)(void *, struct video_frequency *);
 	int	(*set_frequency)(void *, struct video_frequency *);
 	int	(*get_framerate)(void *, struct video_fract *);
 	int	(*set_framerate)(void *, struct video_fract *);
 };
 struct video_attach_args {
 	const struct video_hw_if *hw_if;
 	void	*hw_softc;
 };
-device_t video_attach_mi(const struct video_hw_if *, device_t);
+device_t video_attach_mi(const struct video_hw_if *, device_t, void *);
 device_t video_attach_mi_softc(const struct video_hw_if *, device_t, void *);
 void video_submit_payload(device_t, const struct video_payload *);
 #endif	/* _SYS_DEV_VIDEO_IF_H_ */

 @@ -1,14 +1,14 @@
-/* $NetBSD: auvitek_video.c,v 1.9 2019/01/22 06:47:20 skrll Exp $ */
+/* $NetBSD: auvitek_video.c,v 1.10 2022/03/03 06:23:25 riastradh Exp $ */
 /*-
  * Copyright (c) 2010 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.
  */
 /*
  * Auvitek AU0828 USB controller
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: auvitek_video.c,v 1.9 2019/01/22 06:47:20 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: auvitek_video.c,v 1.10 2022/03/03 06:23:25 riastradh Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/conf.h>
 #include <sys/kmem.h>
 #include <sys/bus.h>
 #include <dev/usb/usb.h>
 #include <dev/usb/usbdi.h>
 #include <dev/usb/usbdivar.h>
 #include <dev/usb/usbdi_util.h>
 #include <dev/usb/usbdevs.h>
 @@ -142,29 +142,30 @@ auvitek_video_detach(struct auvitek_soft
+{
 	if (sc->sc_videodev != NULL) {
 		config_detach(sc->sc_videodev, flags);
 		sc->sc_videodev = NULL;
+	}
 	return 0;
+}
 void
 auvitek_video_rescan(struct auvitek_softc *sc, const char *ifattr,
     const int *locs)
+{
-	if (ifattr_match(ifattr, "videobus") && sc->sc_videodev == NULL)
+	if (ifattr_match(ifattr, "videobus") && sc->sc_videodev == NULL) {
 		sc->sc_videodev = video_attach_mi(&auvitek_video_if,
-		    sc->sc_dev);
+		    sc->sc_dev, sc);
+	}
+}
 void
 auvitek_video_childdet(struct auvitek_softc *sc, device_t child)
+{
 	if (sc->sc_videodev == child)
 		sc->sc_videodev = NULL;
+}
 static int
 auvitek_open(void *opaque, int flags)
+{
 	struct auvitek_softc *sc = opaque;

 @@ -1,14 +1,14 @@
-/* $NetBSD: pseye.c,v 1.28 2020/05/22 11:24:31 jmcneill Exp $ */
+/* $NetBSD: pseye.c,v 1.29 2022/03/03 06:23:25 riastradh Exp $ */
 /*-
  * Copyright (c) 2008 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.
 @@ -27,27 +27,27 @@
  */
 /*
  * Sony PlayStation Eye Driver
+ *
  * The only documentation we have for this part is based on a series
  * of forum postings by Jim Paris on ps2dev.org. Many thanks for
  * figuring this one out.
+ *
  * URL: http://forums.ps2dev.org/viewtopic.php?t=9238
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pseye.c,v 1.28 2020/05/22 11:24:31 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pseye.c,v 1.29 2022/03/03 06:23:25 riastradh Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/fcntl.h>
 #include <sys/conf.h>
 #include <sys/poll.h>
 #include <sys/bus.h>
 #include <sys/mutex.h>
 #include <sys/kthread.h>
 #include <sys/condvar.h>
 #include <sys/module.h>
 @@ -253,27 +253,27 @@ pseye_attach(device_t parent, device_t s
 	if (error) {
 		aprint_error_dev(self, "couldn't create transfer\n");
 		pseye_close_pipes(sc);
 		return;
+	}
 	sc->sc_bulkin_buffer = usbd_get_buffer(sc->sc_bulkin_xfer);
 	pseye_init(sc);
 	if (!pmf_device_register(self, NULL, NULL))
 		aprint_error_dev(self, "couldn't establish power handler\n");
-	sc->sc_videodev = video_attach_mi(&pseye_hw_if, self);
+	sc->sc_videodev = video_attach_mi(&pseye_hw_if, self, sc);
 	if (sc->sc_videodev == NULL) {
 		aprint_error_dev(self, "couldn't attach video layer\n");
 		sc->sc_dying = 1;
 		return;
+	}
 	usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, self);
+}
 static int
 pseye_detach(device_t self, int flags)
+{

 @@ -1,14 +1,14 @@
-/*	$NetBSD: uvideo.c,v 1.68 2022/03/03 06:22:53 riastradh Exp $	*/
+/*	$NetBSD: uvideo.c,v 1.69 2022/03/03 06:23:25 riastradh Exp $	*/
 /*
  * Copyright (c) 2008 Patrick Mahoney
  * All rights reserved.
+ *
  * This code was written by Patrick Mahoney (pat@polycrystal.org) as
  * part of Google Summer of Code 2008.
+ *
  * 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.
 @@ -32,27 +32,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.
  */
 /*
  * USB video specs:
  *      http://www.usb.org/developers/devclass_docs/USB_Video_Class_1_1.zip
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvideo.c,v 1.68 2022/03/03 06:22:53 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvideo.c,v 1.69 2022/03/03 06:23:25 riastradh Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
 #endif
 #ifdef _MODULE
 #include <sys/module.h>
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/kmem.h>
 @@ -593,28 +593,28 @@ uvideo_attach(device_t parent, device_t
 			break;
+		}
+	}
 	usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, sc->sc_dev);
 	if (!pmf_device_register(self, NULL, NULL))
 		aprint_error_dev(self, "couldn't establish power handler\n");
 	SLIST_FOREACH(vs, &sc->sc_stream_list, entries) {
 		/* XXX initialization of vs_videodev is racy */
-		vs->vs_videodev = video_attach_mi_softc(&uvideo_hw_if,
+		vs->vs_videodev = video_attach_mi(&uvideo_hw_if, sc->sc_dev,
-		    sc->sc_dev, vs);
+		    vs);
+	}
 	return;
 bad:
 	if (err != USBD_NORMAL_COMPLETION) {
 		DPRINTF(("uvideo_attach: error: %s (%d)\n",
 			 usbd_errstr(err), err));
+	}
 	return;
+}