summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authormlelstv <mlelstv@NetBSD.org>2015-04-26 15:15:19 +0000
committermlelstv <mlelstv@NetBSD.org>2015-04-26 15:15:19 +0000
commit8fbc729d5944c7b69e2be67b2181444bf87bd94c (patch)
tree42aa53990f3ff8a99a29a233c700310944b66e7f /sys/dev
parentefd88bac79fa009f6c8cfa7399bc126fa23723fb (diff)
Use C99-style initializers for struct dkdriver.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/altmem/altmem.c9
-rw-r--r--sys/dev/ata/wd.c9
-rw-r--r--sys/dev/isa/fd.c9
-rw-r--r--sys/dev/isa/mcd.c8
-rw-r--r--sys/dev/mca/ed_mca.c9
-rw-r--r--sys/dev/md.c8
-rw-r--r--sys/dev/mscp/mscp_disk.c7
-rw-r--r--sys/dev/ofw/ofdisk.c9
-rw-r--r--sys/dev/qbus/rf.c6
-rw-r--r--sys/dev/qbus/rl.c7
-rw-r--r--sys/dev/raidframe/rf_netbsdkintf.c9
-rw-r--r--sys/dev/scsipi/cd.c9
-rw-r--r--sys/dev/scsipi/sd.c9
-rw-r--r--sys/dev/spi/spiflash.c8
-rw-r--r--sys/dev/vme/xd.c8
-rw-r--r--sys/dev/vme/xy.c8
-rw-r--r--sys/dev/vnd.c9
17 files changed, 90 insertions, 51 deletions
diff --git a/sys/dev/altmem/altmem.c b/sys/dev/altmem/altmem.c
index 1540f24d670..0ab09269dcd 100644
--- a/sys/dev/altmem/altmem.c
+++ b/sys/dev/altmem/altmem.c
@@ -1,4 +1,4 @@
-/* $NetBSD: altmem.c,v 1.4 2014/07/25 08:10:36 dholland Exp $ */
+/* $NetBSD: altmem.c,v 1.5 2015/04/26 15:15:20 mlelstv Exp $ */
/*-
* Copyright (c) 2009 Jared D. McNeill <jmcneill@invisible.ca>
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: altmem.c,v 1.4 2014/07/25 08:10:36 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: altmem.c,v 1.5 2015/04/26 15:15:20 mlelstv Exp $");
#include <sys/param.h>
#include <sys/types.h>
#include <sys/device.h>
@@ -83,7 +83,10 @@ const struct cdevsw altmem_cdevsw = {
.d_discard = nodiscard,
.d_flag = D_DISK
};
-static struct dkdriver altmemdkdriver = { altmemstrategy, minphys };
+static struct dkdriver altmemdkdriver = {
+ .d_strategy = altmemstrategy,
+ .d_minphys = minphys
+};
extern struct cfdriver altmem_cd;
CFATTACH_DECL_NEW(altmem, sizeof(struct altmem_softc), altmem_match,
diff --git a/sys/dev/ata/wd.c b/sys/dev/ata/wd.c
index 07e16f00042..60036650290 100644
--- a/sys/dev/ata/wd.c
+++ b/sys/dev/ata/wd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wd.c,v 1.419 2015/04/13 16:33:24 riastradh Exp $ */
+/* $NetBSD: wd.c,v 1.420 2015/04/26 15:15:20 mlelstv Exp $ */
/*
* Copyright (c) 1998, 2001 Manuel Bouyer. All rights reserved.
@@ -54,7 +54,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wd.c,v 1.419 2015/04/13 16:33:24 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wd.c,v 1.420 2015/04/26 15:15:20 mlelstv Exp $");
#include "opt_ata.h"
@@ -202,7 +202,10 @@ bool wd_shutdown(device_t, int);
int wd_getcache(struct wd_softc *, int *);
int wd_setcache(struct wd_softc *, int);
-struct dkdriver wddkdriver = { wdstrategy, wdminphys };
+struct dkdriver wddkdriver = {
+ .d_strategy = wdstrategy,
+ .d_minphys = wdminphys
+};
#ifdef HAS_BAD144_HANDLING
static void bad144intern(struct wd_softc *);
diff --git a/sys/dev/isa/fd.c b/sys/dev/isa/fd.c
index 231b92a892e..d4c263b2a96 100644
--- a/sys/dev/isa/fd.c
+++ b/sys/dev/isa/fd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fd.c,v 1.108 2015/04/13 16:33:24 riastradh Exp $ */
+/* $NetBSD: fd.c,v 1.109 2015/04/26 15:15:20 mlelstv Exp $ */
/*-
* Copyright (c) 1998, 2003, 2008 The NetBSD Foundation, Inc.
@@ -81,7 +81,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.108 2015/04/13 16:33:24 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.109 2015/04/26 15:15:20 mlelstv Exp $");
#include "opt_ddb.h"
@@ -253,7 +253,10 @@ void fdgetdisklabel(struct fd_softc *);
int fd_get_parms(struct fd_softc *);
void fdstart(struct fd_softc *);
-struct dkdriver fddkdriver = { fdstrategy, NULL };
+struct dkdriver fddkdriver = {
+ .d_strategy = fdstrategy,
+ .d_minphys = minphys
+};
#if defined(i386) || defined(x86_64)
const struct fd_type *fd_nvtotype(const char *, int, int);
diff --git a/sys/dev/isa/mcd.c b/sys/dev/isa/mcd.c
index 2a66c293961..a869a29e935 100644
--- a/sys/dev/isa/mcd.c
+++ b/sys/dev/isa/mcd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mcd.c,v 1.114 2014/12/31 19:52:05 christos Exp $ */
+/* $NetBSD: mcd.c,v 1.115 2015/04/26 15:15:20 mlelstv Exp $ */
/*
* Copyright (c) 1993, 1994, 1995 Charles M. Hannum. All rights reserved.
@@ -56,7 +56,7 @@
/*static char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore";*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mcd.c,v 1.114 2014/12/31 19:52:05 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mcd.c,v 1.115 2015/04/26 15:15:20 mlelstv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -239,7 +239,9 @@ int mcd_get_parms(struct mcd_softc *);
void mcdstart(struct mcd_softc *);
void mcd_pseudointr(void *);
-struct dkdriver mcddkdriver = { mcdstrategy, NULL, };
+struct dkdriver mcddkdriver = {
+ .d_strategy = mcdstrategy
+};
#define MCD_RETRIES 3
#define MCD_RDRETRIES 3
diff --git a/sys/dev/mca/ed_mca.c b/sys/dev/mca/ed_mca.c
index e576711883f..ad87f848996 100644
--- a/sys/dev/mca/ed_mca.c
+++ b/sys/dev/mca/ed_mca.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ed_mca.c,v 1.63 2015/04/13 16:33:24 riastradh Exp $ */
+/* $NetBSD: ed_mca.c,v 1.64 2015/04/26 15:15:20 mlelstv Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ed_mca.c,v 1.63 2015/04/13 16:33:24 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ed_mca.c,v 1.64 2015/04/26 15:15:20 mlelstv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -121,7 +121,10 @@ const struct cdevsw ed_cdevsw = {
.d_flag = D_DISK
};
-static struct dkdriver eddkdriver = { edmcastrategy, minphys };
+static struct dkdriver eddkdriver = {
+ .d_strategy = edmcastrategy,
+ .d_minphys = minphys
+};
/*
* Just check if it's possible to identify the disk.
diff --git a/sys/dev/md.c b/sys/dev/md.c
index 4278a0f87e2..8867f152dc0 100644
--- a/sys/dev/md.c
+++ b/sys/dev/md.c
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.73 2015/01/02 19:42:06 christos Exp $ */
+/* $NetBSD: md.c,v 1.74 2015/04/26 15:15:20 mlelstv Exp $ */
/*
* Copyright (c) 1995 Gordon W. Ross, Leo Weppelman.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: md.c,v 1.73 2015/01/02 19:42:06 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: md.c,v 1.74 2015/04/26 15:15:20 mlelstv Exp $");
#ifdef _KERNEL_OPT
#include "opt_md.h"
@@ -132,7 +132,9 @@ const struct cdevsw md_cdevsw = {
.d_flag = D_DISK
};
-static struct dkdriver mddkdriver = { mdstrategy, NULL };
+static struct dkdriver mddkdriver = {
+ .d_strategy = mdstrategy
+};
extern struct cfdriver md_cd;
CFATTACH_DECL3_NEW(md, sizeof(struct md_softc),
diff --git a/sys/dev/mscp/mscp_disk.c b/sys/dev/mscp/mscp_disk.c
index f0174b17afc..2c9ef3f20a5 100644
--- a/sys/dev/mscp/mscp_disk.c
+++ b/sys/dev/mscp/mscp_disk.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mscp_disk.c,v 1.87 2015/01/02 19:42:07 christos Exp $ */
+/* $NetBSD: mscp_disk.c,v 1.88 2015/04/26 15:15:20 mlelstv Exp $ */
/*
* Copyright (c) 1988 Regents of the University of California.
* All rights reserved.
@@ -82,7 +82,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mscp_disk.c,v 1.87 2015/01/02 19:42:07 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mscp_disk.c,v 1.88 2015/04/26 15:15:20 mlelstv Exp $");
#include <sys/param.h>
#include <sys/buf.h>
@@ -183,7 +183,8 @@ const struct cdevsw ra_cdevsw = {
};
static struct dkdriver radkdriver = {
- rastrategy, minphys
+ .d_strategy = rastrategy,
+ .d_minphys = minphys
};
/*
diff --git a/sys/dev/ofw/ofdisk.c b/sys/dev/ofw/ofdisk.c
index a14ab2a01e8..797262a21a6 100644
--- a/sys/dev/ofw/ofdisk.c
+++ b/sys/dev/ofw/ofdisk.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ofdisk.c,v 1.50 2014/12/31 19:52:06 christos Exp $ */
+/* $NetBSD: ofdisk.c,v 1.51 2015/04/26 15:15:20 mlelstv Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofdisk.c,v 1.50 2014/12/31 19:52:06 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofdisk.c,v 1.51 2015/04/26 15:15:20 mlelstv Exp $");
#include <sys/param.h>
#include <sys/buf.h>
@@ -108,7 +108,10 @@ const struct cdevsw ofdisk_cdevsw = {
static void ofminphys(struct buf *);
-struct dkdriver ofdisk_dkdriver = { ofdisk_strategy, ofminphys };
+struct dkdriver ofdisk_dkdriver = {
+ .d_strategy = ofdisk_strategy,
+ .d_minphys = ofminphys
+};
void ofdisk_getdefaultlabel (struct ofdisk_softc *, struct disklabel *);
void ofdisk_getdisklabel (dev_t);
diff --git a/sys/dev/qbus/rf.c b/sys/dev/qbus/rf.c
index 134619b1c15..d0c3d8b3f11 100644
--- a/sys/dev/qbus/rf.c
+++ b/sys/dev/qbus/rf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf.c,v 1.31 2015/01/02 19:42:07 christos Exp $ */
+/* $NetBSD: rf.c,v 1.32 2015/04/26 15:15:20 mlelstv Exp $ */
/*
* Copyright (c) 2002 Jochen Kunz.
* All rights reserved.
@@ -36,7 +36,7 @@ TODO:
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf.c,v 1.31 2015/01/02 19:42:07 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf.c,v 1.32 2015/04/26 15:15:20 mlelstv Exp $");
/* autoconfig stuff */
#include <sys/param.h>
@@ -202,7 +202,7 @@ struct rfc_attach_args {
const struct dkdriver rfdkdriver = {
- rfstrategy
+ .d_strategy = rfstrategy
};
diff --git a/sys/dev/qbus/rl.c b/sys/dev/qbus/rl.c
index 11e7034639e..0f446edc8c5 100644
--- a/sys/dev/qbus/rl.c
+++ b/sys/dev/qbus/rl.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rl.c,v 1.49 2015/01/02 19:42:07 christos Exp $ */
+/* $NetBSD: rl.c,v 1.50 2015/04/26 15:15:20 mlelstv Exp $ */
/*
* Copyright (c) 2000 Ludd, University of Lule}, Sweden. All rights reserved.
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rl.c,v 1.49 2015/01/02 19:42:07 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rl.c,v 1.50 2015/04/26 15:15:20 mlelstv Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -140,7 +140,8 @@ static const char * const rlstates[] = {
};
static const struct dkdriver rldkdriver = {
- rlstrategy, minphys
+ .d_strategy = rlstrategy,
+ .d_minphys = minphys
};
static const char *
diff --git a/sys/dev/raidframe/rf_netbsdkintf.c b/sys/dev/raidframe/rf_netbsdkintf.c
index 05aba44565d..67f14c8adcf 100644
--- a/sys/dev/raidframe/rf_netbsdkintf.c
+++ b/sys/dev/raidframe/rf_netbsdkintf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_netbsdkintf.c,v 1.322 2015/01/03 11:48:04 prlw1 Exp $ */
+/* $NetBSD: rf_netbsdkintf.c,v 1.323 2015/04/26 15:15:20 mlelstv Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2008-2011 The NetBSD Foundation, Inc.
@@ -101,7 +101,7 @@
***********************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.322 2015/01/03 11:48:04 prlw1 Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.323 2015/04/26 15:15:20 mlelstv Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -230,7 +230,10 @@ const struct cdevsw raid_cdevsw = {
.d_flag = D_DISK
};
-static struct dkdriver rf_dkdriver = { raidstrategy, minphys };
+static struct dkdriver rf_dkdriver = {
+ .d_strategy = raidstrategy,
+ .d_minphys = minphys
+};
struct raid_softc {
device_t sc_dev;
diff --git a/sys/dev/scsipi/cd.c b/sys/dev/scsipi/cd.c
index 058ff512d8d..0b7e18dfa22 100644
--- a/sys/dev/scsipi/cd.c
+++ b/sys/dev/scsipi/cd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cd.c,v 1.329 2015/04/13 16:33:25 riastradh Exp $ */
+/* $NetBSD: cd.c,v 1.330 2015/04/26 15:15:20 mlelstv Exp $ */
/*-
* Copyright (c) 1998, 2001, 2003, 2004, 2005, 2008 The NetBSD Foundation,
@@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cd.c,v 1.329 2015/04/13 16:33:25 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cd.c,v 1.330 2015/04/26 15:15:20 mlelstv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -229,7 +229,10 @@ const struct cdevsw cd_cdevsw = {
.d_flag = D_DISK
};
-static struct dkdriver cddkdriver = { cdstrategy, NULL };
+static struct dkdriver cddkdriver = {
+ .d_strategy = cdstrategy,
+ .d_minphys = cdminphys
+};
static const struct scsipi_periphsw cd_switch = {
cd_interpret_sense, /* use our error handler first */
diff --git a/sys/dev/scsipi/sd.c b/sys/dev/scsipi/sd.c
index 407f614a8a7..7e75fc07188 100644
--- a/sys/dev/scsipi/sd.c
+++ b/sys/dev/scsipi/sd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sd.c,v 1.315 2015/04/13 16:33:25 riastradh Exp $ */
+/* $NetBSD: sd.c,v 1.316 2015/04/26 15:15:20 mlelstv Exp $ */
/*-
* Copyright (c) 1998, 2003, 2004 The NetBSD Foundation, Inc.
@@ -47,7 +47,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sd.c,v 1.315 2015/04/13 16:33:25 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sd.c,v 1.316 2015/04/26 15:15:20 mlelstv Exp $");
#include "opt_scsi.h"
@@ -181,7 +181,10 @@ const struct cdevsw sd_cdevsw = {
.d_flag = D_DISK
};
-static struct dkdriver sddkdriver = { sdstrategy, sdminphys };
+static struct dkdriver sddkdriver = {
+ .d_strategy = sdstrategy,
+ .d_minphys = sdminphys
+};
static const struct scsipi_periphsw sd_switch = {
sd_interpret_sense, /* check our error handler first */
diff --git a/sys/dev/spi/spiflash.c b/sys/dev/spi/spiflash.c
index 1cb52161884..2e44530f9f9 100644
--- a/sys/dev/spi/spiflash.c
+++ b/sys/dev/spi/spiflash.c
@@ -1,4 +1,4 @@
-/* $NetBSD: spiflash.c,v 1.16 2014/10/11 13:56:01 mlelstv Exp $ */
+/* $NetBSD: spiflash.c,v 1.17 2015/04/26 15:15:20 mlelstv Exp $ */
/*-
* Copyright (c) 2006 Urbana-Champaign Independent Media Center.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: spiflash.c,v 1.16 2014/10/11 13:56:01 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spiflash.c,v 1.17 2015/04/26 15:15:20 mlelstv Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -166,7 +166,9 @@ const struct cdevsw spiflash_cdevsw = {
.d_flag = D_DISK,
};
-static struct dkdriver spiflash_dkdriver = { spiflash_strategy, NULL };
+static struct dkdriver spiflash_dkdriver = {
+ .d_strategy = spiflash_strategy
+};
spiflash_handle_t
spiflash_attach_mi(const struct spiflash_hw_if *hw, void *cookie,
diff --git a/sys/dev/vme/xd.c b/sys/dev/vme/xd.c
index 2cf83111ad9..dbaf13ed1cb 100644
--- a/sys/dev/vme/xd.c
+++ b/sys/dev/vme/xd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: xd.c,v 1.94 2014/12/31 19:52:06 christos Exp $ */
+/* $NetBSD: xd.c,v 1.95 2015/04/26 15:15:20 mlelstv Exp $ */
/*
* Copyright (c) 1995 Charles D. Cranor
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xd.c,v 1.94 2014/12/31 19:52:06 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xd.c,v 1.95 2015/04/26 15:15:20 mlelstv Exp $");
#undef XDC_DEBUG /* full debug */
#define XDC_DIAG /* extra sanity checks */
@@ -327,7 +327,9 @@ struct xdc_attach_args { /* this is the "aux" args to xdattach */
* dkdriver
*/
-struct dkdriver xddkdriver = {xdstrategy};
+struct dkdriver xddkdriver = {
+ .d_strategy = xdstrategy
+};
/*
* start: disk label fix code (XXX)
diff --git a/sys/dev/vme/xy.c b/sys/dev/vme/xy.c
index 67682ed0a3d..95ebbdea3da 100644
--- a/sys/dev/vme/xy.c
+++ b/sys/dev/vme/xy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: xy.c,v 1.98 2014/12/31 19:52:06 christos Exp $ */
+/* $NetBSD: xy.c,v 1.99 2015/04/26 15:15:20 mlelstv Exp $ */
/*
* Copyright (c) 1995 Charles D. Cranor
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xy.c,v 1.98 2014/12/31 19:52:06 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xy.c,v 1.99 2015/04/26 15:15:20 mlelstv Exp $");
#undef XYC_DEBUG /* full debug */
#undef XYC_DIAG /* extra sanity checks */
@@ -243,7 +243,9 @@ struct xyc_attach_args { /* this is the "aux" args to xyattach */
* dkdriver
*/
-struct dkdriver xydkdriver = { xystrategy };
+struct dkdriver xydkdriver = {
+ .d_strategy = xystrategy
+};
/*
* start: disk label fix code (XXX)
diff --git a/sys/dev/vnd.c b/sys/dev/vnd.c
index 36265a92847..adaff4ad97b 100644
--- a/sys/dev/vnd.c
+++ b/sys/dev/vnd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: vnd.c,v 1.242 2015/04/06 12:02:08 mlelstv Exp $ */
+/* $NetBSD: vnd.c,v 1.243 2015/04/26 15:15:20 mlelstv Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2008 The NetBSD Foundation, Inc.
@@ -91,7 +91,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vnd.c,v 1.242 2015/04/06 12:02:08 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vnd.c,v 1.243 2015/04/26 15:15:20 mlelstv Exp $");
#if defined(_KERNEL_OPT)
#include "opt_vnd.h"
@@ -233,7 +233,10 @@ extern struct cfdriver vnd_cd;
static struct vnd_softc *vnd_spawn(int);
int vnd_destroy(device_t);
-static struct dkdriver vnddkdriver = { vndstrategy, minphys };
+static struct dkdriver vnddkdriver = {
+ .d_strategy = vndstrategy,
+ .d_minphys = minphys
+};
void
vndattach(int num)