Module Name: src
Committed By: pgoyette
Date: Sun Apr 30 10:27:16 UTC 2017
Modified Files:
src/sys/dev/ata [prg-localcount2]: wd.c
src/sys/dev/ic [prg-localcount2]: mlx.c nvme.c
Log Message:
And a few more DEVSW_MODULE_INIT for modular drivers
To generate a diff of this commit:
cvs rdiff -u -r1.429 -r1.429.2.1 src/sys/dev/ata/wd.c
cvs rdiff -u -r1.65 -r1.65.6.1 src/sys/dev/ic/mlx.c
cvs rdiff -u -r1.26 -r1.26.4.1 src/sys/dev/ic/nvme.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/wd.c
diff -u src/sys/dev/ata/wd.c:1.429 src/sys/dev/ata/wd.c:1.429.2.1
--- src/sys/dev/ata/wd.c:1.429 Mon Apr 24 09:42:52 2017
+++ src/sys/dev/ata/wd.c Sun Apr 30 10:27:16 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: wd.c,v 1.429 2017/04/24 09:42:52 jdolecek Exp $ */
+/* $NetBSD: wd.c,v 1.429.2.1 2017/04/30 10:27:16 pgoyette 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.429 2017/04/24 09:42:52 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wd.c,v 1.429.2.1 2017/04/30 10:27:16 pgoyette Exp $");
#include "opt_ata.h"
@@ -143,6 +143,7 @@ dev_type_size(wdsize);
static dev_type_discard(wddiscard);
const struct bdevsw wd_bdevsw = {
+ DEVSW_MODULE_INIT
.d_open = wdopen,
.d_close = wdclose,
.d_strategy = wdstrategy,
@@ -154,6 +155,7 @@ const struct bdevsw wd_bdevsw = {
};
const struct cdevsw wd_cdevsw = {
+ DEVSW_MODULE_INIT
.d_open = wdopen,
.d_close = wdclose,
.d_read = wdread,
Index: src/sys/dev/ic/mlx.c
diff -u src/sys/dev/ic/mlx.c:1.65 src/sys/dev/ic/mlx.c:1.65.6.1
--- src/sys/dev/ic/mlx.c:1.65 Tue Sep 27 03:33:32 2016
+++ src/sys/dev/ic/mlx.c Sun Apr 30 10:27:16 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: mlx.c,v 1.65 2016/09/27 03:33:32 pgoyette Exp $ */
+/* $NetBSD: mlx.c,v 1.65.6.1 2017/04/30 10:27:16 pgoyette Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mlx.c,v 1.65 2016/09/27 03:33:32 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mlx.c,v 1.65.6.1 2017/04/30 10:27:16 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "ld.h"
@@ -132,6 +132,7 @@ dev_type_close(mlxclose);
dev_type_ioctl(mlxioctl);
const struct cdevsw mlx_cdevsw = {
+ DEVSW_MODULE_INIT
.d_open = mlxopen,
.d_close = mlxclose,
.d_read = noread,
Index: src/sys/dev/ic/nvme.c
diff -u src/sys/dev/ic/nvme.c:1.26 src/sys/dev/ic/nvme.c:1.26.4.1
--- src/sys/dev/ic/nvme.c:1.26 Wed Apr 5 20:15:49 2017
+++ src/sys/dev/ic/nvme.c Sun Apr 30 10:27:16 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: nvme.c,v 1.26 2017/04/05 20:15:49 jdolecek Exp $ */
+/* $NetBSD: nvme.c,v 1.26.4.1 2017/04/30 10:27:16 pgoyette Exp $ */
/* $OpenBSD: nvme.c,v 1.49 2016/04/18 05:59:50 dlg Exp $ */
/*
@@ -18,7 +18,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nvme.c,v 1.26 2017/04/05 20:15:49 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nvme.c,v 1.26.4.1 2017/04/30 10:27:16 pgoyette Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1690,6 +1690,7 @@ dev_type_close(nvmeclose);
dev_type_ioctl(nvmeioctl);
const struct cdevsw nvme_cdevsw = {
+ DEVSW_MODULE_INIT
.d_open = nvmeopen,
.d_close = nvmeclose,
.d_read = noread,