summaryrefslogtreecommitdiff
path: root/sys/dev/hyperv
diff options
context:
space:
mode:
authorthorpej <thorpej@NetBSD.org>2021-08-07 16:18:40 +0000
committerthorpej <thorpej@NetBSD.org>2021-08-07 16:18:40 +0000
commitbeecddb649a2e3a370868f6fe61348b9c18bce22 (patch)
treea06dcd6c97457e2758aab0e0483fa0b729ff1b86 /sys/dev/hyperv
parentf521c7d9202d2061b5d1f2d0206b1b8335f9dcc2 (diff)
Merge thorpej-cfargs2.
Diffstat (limited to 'sys/dev/hyperv')
-rw-r--r--sys/dev/hyperv/genfb_vmbus.c7
-rw-r--r--sys/dev/hyperv/hvkbd.c6
-rw-r--r--sys/dev/hyperv/hvs.c6
-rw-r--r--sys/dev/hyperv/vmbus.c6
4 files changed, 12 insertions, 13 deletions
diff --git a/sys/dev/hyperv/genfb_vmbus.c b/sys/dev/hyperv/genfb_vmbus.c
index be53f9dc826..849835aa87a 100644
--- a/sys/dev/hyperv/genfb_vmbus.c
+++ b/sys/dev/hyperv/genfb_vmbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: genfb_vmbus.c,v 1.2 2021/04/24 23:36:54 thorpej Exp $ */
+/* $NetBSD: genfb_vmbus.c,v 1.3 2021/08/07 16:19:11 thorpej Exp $ */
/*-
* Copyright (c) 2007 Michael Lorenz
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: genfb_vmbus.c,v 1.2 2021/04/24 23:36:54 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: genfb_vmbus.c,v 1.3 2021/08/07 16:19:11 thorpej Exp $");
#include "opt_wsfb.h"
#include "opt_genfb.h"
@@ -115,8 +115,7 @@ genfb_vmbus_attach(device_t parent, device_t self, void *aux)
/* now try to attach a DRM */
config_found(self, aux, genfb_vmbus_drm_print,
- CFARG_IATTR, "drm",
- CFARG_EOL);
+ CFARGS(.iattr = "drm"));
}
static int
diff --git a/sys/dev/hyperv/hvkbd.c b/sys/dev/hyperv/hvkbd.c
index fa13a0f738c..1a96e033257 100644
--- a/sys/dev/hyperv/hvkbd.c
+++ b/sys/dev/hyperv/hvkbd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: hvkbd.c,v 1.8 2021/04/24 23:36:54 thorpej Exp $ */
+/* $NetBSD: hvkbd.c,v 1.9 2021/08/07 16:19:11 thorpej Exp $ */
/*-
* Copyright (c) 2017 Microsoft Corp.
@@ -36,7 +36,7 @@
#endif /* _KERNEL_OPT */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hvkbd.c,v 1.8 2021/04/24 23:36:54 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hvkbd.c,v 1.9 2021/08/07 16:19:11 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -237,7 +237,7 @@ hvkbd_attach(device_t parent, device_t self, void *aux)
a.keymap = &hvkbd_keymapdata;
a.accessops = &hvkbd_accessops;
a.accesscookie = sc;
- sc->sc_wskbddev = config_found(self, &a, wskbddevprint, CFARG_EOL);
+ sc->sc_wskbddev = config_found(self, &a, wskbddevprint, CFARGS_NONE);
return;
free_buf:
diff --git a/sys/dev/hyperv/hvs.c b/sys/dev/hyperv/hvs.c
index 06ded9cc49c..44551780f16 100644
--- a/sys/dev/hyperv/hvs.c
+++ b/sys/dev/hyperv/hvs.c
@@ -1,4 +1,4 @@
-/* $NetBSD: hvs.c,v 1.6 2021/06/10 07:48:00 nonaka Exp $ */
+/* $NetBSD: hvs.c,v 1.7 2021/08/07 16:19:11 thorpej Exp $ */
/* $OpenBSD: hvs.c,v 1.17 2017/08/10 17:22:48 mikeb Exp $ */
/*-
@@ -37,7 +37,7 @@
/* #define HVS_DEBUG_IO */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hvs.c,v 1.6 2021/06/10 07:48:00 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hvs.c,v 1.7 2021/08/07 16:19:11 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -392,7 +392,7 @@ hvs_attach(device_t parent, device_t self, void *aux)
chan->chan_defquirks |= PQUIRK_ONLYBIG;
sc->sc_scsibus = config_found(self, &sc->sc_channel, scsiprint,
- CFARG_EOL);
+ CFARGS_NONE);
/*
* If the driver has successfully attached to an IDE device,
diff --git a/sys/dev/hyperv/vmbus.c b/sys/dev/hyperv/vmbus.c
index f908854e249..2605c13fb69 100644
--- a/sys/dev/hyperv/vmbus.c
+++ b/sys/dev/hyperv/vmbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: vmbus.c,v 1.13 2021/04/24 23:36:54 thorpej Exp $ */
+/* $NetBSD: vmbus.c,v 1.14 2021/08/07 16:19:11 thorpej Exp $ */
/* $OpenBSD: hyperv.c,v 1.43 2017/06/27 13:56:15 mikeb Exp $ */
/*-
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vmbus.c,v 1.13 2021/04/24 23:36:54 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vmbus.c,v 1.14 2021/08/07 16:19:11 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -2203,7 +2203,7 @@ vmbus_process_devq(void *arg)
vaa.aa_iot = sc->sc_iot;
vaa.aa_memt = sc->sc_memt;
ch->ch_dev = config_found(sc->sc_dev,
- &vaa, vmbus_attach_print, CFARG_EOL);
+ &vaa, vmbus_attach_print, CFARGS_NONE);
break;
case VMBUS_DEV_TYPE_DETACH: