Module Name: src
Committed By: thorpej
Date: Wed Aug 4 17:27:29 UTC 2021
Modified Files:
src/sys/dev/ata [thorpej-cfargs2]: ata.c ata_raid.c
src/sys/dev/audio [thorpej-cfargs2]: audio.c
Log Message:
Adapt to CFARGS().
To generate a diff of this commit:
cvs rdiff -u -r1.161 -r1.161.8.1 src/sys/dev/ata/ata.c
cvs rdiff -u -r1.44 -r1.44.8.1 src/sys/dev/ata/ata_raid.c
cvs rdiff -u -r1.105 -r1.105.2.1 src/sys/dev/audio/audio.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ata/ata.c
diff -u src/sys/dev/ata/ata.c:1.161 src/sys/dev/ata/ata.c:1.161.8.1
--- src/sys/dev/ata/ata.c:1.161 Sat Apr 24 23:36:52 2021
+++ src/sys/dev/ata/ata.c Wed Aug 4 17:27:29 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ata.c,v 1.161 2021/04/24 23:36:52 thorpej Exp $ */
+/* $NetBSD: ata.c,v 1.161.8.1 2021/08/04 17:27:29 thorpej Exp $ */
/*
* Copyright (c) 1998, 2001 Manuel Bouyer. All rights reserved.
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ata.c,v 1.161 2021/04/24 23:36:52 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ata.c,v 1.161.8.1 2021/08/04 17:27:29 thorpej Exp $");
#include "opt_ata.h"
@@ -206,8 +206,7 @@ ata_channel_attach(struct ata_channel *c
KASSERT(chp->ch_queue != NULL);
chp->atabus = config_found(chp->ch_atac->atac_dev, chp, atabusprint,
- CFARG_IATTR, "ata",
- CFARG_EOL);
+ CFARGS(.iattr = "ata"));
}
/*
@@ -375,8 +374,7 @@ atabusconfig_thread(void *arg)
adev.adev_drv_data = &chp->ch_drive[i];
chp->ch_drive[i].drv_softc = config_found(atabus_sc->sc_dev,
&adev, ataprint,
- CFARG_IATTR, "ata_hl",
- CFARG_EOL);
+ CFARGS(.iattr = "ata_hl"));
if (chp->ch_drive[i].drv_softc != NULL) {
ata_probe_caps(&chp->ch_drive[i]);
} else {
Index: src/sys/dev/ata/ata_raid.c
diff -u src/sys/dev/ata/ata_raid.c:1.44 src/sys/dev/ata/ata_raid.c:1.44.8.1
--- src/sys/dev/ata/ata_raid.c:1.44 Sat Apr 24 23:36:52 2021
+++ src/sys/dev/ata/ata_raid.c Wed Aug 4 17:27:29 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ata_raid.c,v 1.44 2021/04/24 23:36:52 thorpej Exp $ */
+/* $NetBSD: ata_raid.c,v 1.44.8.1 2021/08/04 17:27:29 thorpej Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ata_raid.c,v 1.44 2021/04/24 23:36:52 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ata_raid.c,v 1.44.8.1 2021/08/04 17:27:29 thorpej Exp $");
#include <sys/param.h>
#include <sys/buf.h>
@@ -216,9 +216,8 @@ ataraid_attach(device_t parent, device_t
locs[ATARAIDCF_UNIT] = aai->aai_arrayno;
config_found(self, aai, ataraid_print,
- CFARG_SUBMATCH, config_stdsubmatch,
- CFARG_LOCATORS, locs,
- CFARG_EOL);
+ CFARGS(.submatch = config_stdsubmatch,
+ .locators = locs));
}
}
Index: src/sys/dev/audio/audio.c
diff -u src/sys/dev/audio/audio.c:1.105 src/sys/dev/audio/audio.c:1.105.2.1
--- src/sys/dev/audio/audio.c:1.105 Wed Jul 21 06:14:58 2021
+++ src/sys/dev/audio/audio.c Wed Aug 4 17:27:29 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: audio.c,v 1.105 2021/07/21 06:14:58 isaki Exp $ */
+/* $NetBSD: audio.c,v 1.105.2.1 2021/08/04 17:27:29 thorpej Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -138,7 +138,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.105 2021/07/21 06:14:58 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.105.2.1 2021/08/04 17:27:29 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "audio.h"
@@ -1413,7 +1413,7 @@ audiosearch(device_t parent, cfdata_t cf
if (config_probe(parent, cf, aux))
config_attach(parent, cf, aux, NULL,
- CFARG_EOL);
+ CFARGS_NONE);
return 0;
}
@@ -1424,8 +1424,7 @@ audiorescan(device_t self, const char *i
struct audio_softc *sc = device_private(self);
config_search(sc->sc_dev, NULL,
- CFARG_SEARCH, audiosearch,
- CFARG_EOL);
+ CFARGS(.search = audiosearch));
return 0;
}
@@ -1449,8 +1448,7 @@ audio_attach_mi(const struct audio_hw_if
arg.hwif = ahwp;
arg.hdl = hdlp;
return config_found(dev, &arg, audioprint,
- CFARG_IATTR, "audiobus",
- CFARG_EOL);
+ CFARGS(.iattr = "audiobus"));
}
/*
