Module Name: src
Committed By: maxv
Date: Mon Apr 13 08:05:02 UTC 2020
Modified Files:
src/sys/dev: cgd.c ld.c md.c vnd.c
src/sys/dev/ata: wd.c
src/sys/dev/scsipi: cd.c sd.c
Log Message:
constify
To generate a diff of this commit:
cvs rdiff -u -r1.124 -r1.125 src/sys/dev/cgd.c
cvs rdiff -u -r1.109 -r1.110 src/sys/dev/ld.c
cvs rdiff -u -r1.83 -r1.84 src/sys/dev/md.c
cvs rdiff -u -r1.275 -r1.276 src/sys/dev/vnd.c
cvs rdiff -u -r1.460 -r1.461 src/sys/dev/ata/wd.c
cvs rdiff -u -r1.343 -r1.344 src/sys/dev/scsipi/cd.c
cvs rdiff -u -r1.328 -r1.329 src/sys/dev/scsipi/sd.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/cgd.c
diff -u src/sys/dev/cgd.c:1.124 src/sys/dev/cgd.c:1.125
--- src/sys/dev/cgd.c:1.124 Fri Mar 20 19:03:13 2020
+++ src/sys/dev/cgd.c Mon Apr 13 08:05:02 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: cgd.c,v 1.124 2020/03/20 19:03:13 tnn Exp $ */
+/* $NetBSD: cgd.c,v 1.125 2020/04/13 08:05:02 maxv Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cgd.c,v 1.124 2020/03/20 19:03:13 tnn Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cgd.c,v 1.125 2020/04/13 08:05:02 maxv Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -233,7 +233,7 @@ static int cgdinit(struct cgd_softc *, c
static void cgd_cipher(struct cgd_softc *, void *, void *,
size_t, daddr_t, size_t, int);
-static struct dkdriver cgddkdriver = {
+static const struct dkdriver cgddkdriver = {
.d_minphys = minphys,
.d_open = cgdopen,
.d_close = cgdclose,
Index: src/sys/dev/ld.c
diff -u src/sys/dev/ld.c:1.109 src/sys/dev/ld.c:1.110
--- src/sys/dev/ld.c:1.109 Sun Mar 1 03:21:54 2020
+++ src/sys/dev/ld.c Mon Apr 13 08:05:02 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ld.c,v 1.109 2020/03/01 03:21:54 riastradh Exp $ */
+/* $NetBSD: ld.c,v 1.110 2020/04/13 08:05:02 maxv Exp $ */
/*-
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ld.c,v 1.109 2020/03/01 03:21:54 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ld.c,v 1.110 2020/04/13 08:05:02 maxv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -110,7 +110,7 @@ const struct cdevsw ld_cdevsw = {
.d_flag = D_DISK | D_MPSAFE
};
-static struct dkdriver lddkdriver = {
+static const struct dkdriver lddkdriver = {
.d_open = ldopen,
.d_close = ldclose,
.d_strategy = ldstrategy,
Index: src/sys/dev/md.c
diff -u src/sys/dev/md.c:1.83 src/sys/dev/md.c:1.84
--- src/sys/dev/md.c:1.83 Sat Jan 18 14:02:18 2020
+++ src/sys/dev/md.c Mon Apr 13 08:05:02 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.83 2020/01/18 14:02:18 ad Exp $ */
+/* $NetBSD: md.c,v 1.84 2020/04/13 08:05:02 maxv 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.83 2020/01/18 14:02:18 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: md.c,v 1.84 2020/04/13 08:05:02 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_md.h"
@@ -131,7 +131,7 @@ const struct cdevsw md_cdevsw = {
.d_flag = D_DISK | D_MPSAFE
};
-static struct dkdriver mddkdriver = {
+static const struct dkdriver mddkdriver = {
.d_strategy = mdstrategy,
.d_minphys = minphys
};
Index: src/sys/dev/vnd.c
diff -u src/sys/dev/vnd.c:1.275 src/sys/dev/vnd.c:1.276
--- src/sys/dev/vnd.c:1.275 Fri Apr 10 10:53:02 2020
+++ src/sys/dev/vnd.c Mon Apr 13 08:05:02 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: vnd.c,v 1.275 2020/04/10 10:53:02 jdolecek Exp $ */
+/* $NetBSD: vnd.c,v 1.276 2020/04/13 08:05:02 maxv Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2008, 2020 The NetBSD Foundation, Inc.
@@ -91,7 +91,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vnd.c,v 1.275 2020/04/10 10:53:02 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vnd.c,v 1.276 2020/04/13 08:05:02 maxv Exp $");
#if defined(_KERNEL_OPT)
#include "opt_vnd.h"
@@ -235,9 +235,9 @@ CFATTACH_DECL3_NEW(vnd, sizeof(struct vn
vnd_match, vnd_attach, vnd_detach, NULL, NULL, NULL, DVF_DETACH_SHUTDOWN);
static struct vnd_softc *vnd_spawn(int);
-int vnd_destroy(device_t);
+static int vnd_destroy(device_t);
-static struct dkdriver vnddkdriver = {
+static const struct dkdriver vnddkdriver = {
.d_strategy = vndstrategy,
.d_minphys = minphys
};
@@ -308,7 +308,7 @@ vnd_spawn(int unit)
return device_private(config_attach_pseudo(cf));
}
-int
+static int
vnd_destroy(device_t dev)
{
int error;
Index: src/sys/dev/ata/wd.c
diff -u src/sys/dev/ata/wd.c:1.460 src/sys/dev/ata/wd.c:1.461
--- src/sys/dev/ata/wd.c:1.460 Tue Apr 7 13:22:05 2020
+++ src/sys/dev/ata/wd.c Mon Apr 13 08:05:02 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: wd.c,v 1.460 2020/04/07 13:22:05 jdolecek Exp $ */
+/* $NetBSD: wd.c,v 1.461 2020/04/13 08:05:02 maxv 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.460 2020/04/07 13:22:05 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wd.c,v 1.461 2020/04/13 08:05:02 maxv Exp $");
#include "opt_ata.h"
#include "opt_wd.h"
@@ -213,7 +213,7 @@ static int wd_setcache(struct wd_softc *
static void wd_sysctl_attach(struct wd_softc *);
static void wd_sysctl_detach(struct wd_softc *);
-struct dkdriver wddkdriver = {
+static const struct dkdriver wddkdriver = {
.d_open = wdopen,
.d_close = wdclose,
.d_strategy = wdstrategy,
Index: src/sys/dev/scsipi/cd.c
diff -u src/sys/dev/scsipi/cd.c:1.343 src/sys/dev/scsipi/cd.c:1.344
--- src/sys/dev/scsipi/cd.c:1.343 Fri Mar 27 11:15:33 2020
+++ src/sys/dev/scsipi/cd.c Mon Apr 13 08:05:02 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: cd.c,v 1.343 2020/03/27 11:15:33 mlelstv Exp $ */
+/* $NetBSD: cd.c,v 1.344 2020/04/13 08:05:02 maxv 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.343 2020/03/27 11:15:33 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cd.c,v 1.344 2020/04/13 08:05:02 maxv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -233,7 +233,7 @@ const struct cdevsw cd_cdevsw = {
.d_flag = D_DISK | D_MPSAFE
};
-static struct dkdriver cddkdriver = {
+static const struct dkdriver cddkdriver = {
.d_open = cdopen,
.d_close = cdclose,
.d_strategy = cdstrategy,
Index: src/sys/dev/scsipi/sd.c
diff -u src/sys/dev/scsipi/sd.c:1.328 src/sys/dev/scsipi/sd.c:1.329
--- src/sys/dev/scsipi/sd.c:1.328 Sun Mar 1 03:21:54 2020
+++ src/sys/dev/scsipi/sd.c Mon Apr 13 08:05:02 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: sd.c,v 1.328 2020/03/01 03:21:54 riastradh Exp $ */
+/* $NetBSD: sd.c,v 1.329 2020/04/13 08:05:02 maxv 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.328 2020/03/01 03:21:54 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sd.c,v 1.329 2020/04/13 08:05:02 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_scsi.h"
@@ -185,7 +185,7 @@ const struct cdevsw sd_cdevsw = {
.d_flag = D_DISK | D_MPSAFE
};
-static struct dkdriver sddkdriver = {
+static const struct dkdriver sddkdriver = {
.d_open = sdopen,
.d_close = sdclose,
.d_strategy = sdstrategy,
