Module Name: src
Committed By: jdolecek
Date: Sun Dec 9 19:21:17 UTC 2018
Modified Files:
src/sys/dev/i2c: i2c.c
src/sys/dev/pci: ichsmb.c
Log Message:
try to detach on shutdown; for now the only practical reason is to test that
the driver detach paths work
To generate a diff of this commit:
cvs rdiff -u -r1.66 -r1.67 src/sys/dev/i2c/i2c.c
cvs rdiff -u -r1.58 -r1.59 src/sys/dev/pci/ichsmb.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/i2c/i2c.c
diff -u src/sys/dev/i2c/i2c.c:1.66 src/sys/dev/i2c/i2c.c:1.67
--- src/sys/dev/i2c/i2c.c:1.66 Tue Jun 26 06:34:55 2018
+++ src/sys/dev/i2c/i2c.c Sun Dec 9 19:21:16 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: i2c.c,v 1.66 2018/06/26 06:34:55 thorpej Exp $ */
+/* $NetBSD: i2c.c,v 1.67 2018/12/09 19:21:16 jdolecek Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
#endif
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i2c.c,v 1.66 2018/06/26 06:34:55 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i2c.c,v 1.67 2018/12/09 19:21:16 jdolecek Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -844,8 +844,9 @@ iic_ioctl(dev_t dev, u_long cmd, void *d
}
-CFATTACH_DECL2_NEW(iic, sizeof(struct iic_softc),
- iic_match, iic_attach, iic_detach, NULL, iic_rescan, iic_child_detach);
+CFATTACH_DECL3_NEW(iic, sizeof(struct iic_softc),
+ iic_match, iic_attach, iic_detach, NULL, iic_rescan, iic_child_detach,
+ DVF_DETACH_SHUTDOWN);
MODULE(MODULE_CLASS_DRIVER, iic, "i2cexec,i2c_bitbang");
Index: src/sys/dev/pci/ichsmb.c
diff -u src/sys/dev/pci/ichsmb.c:1.58 src/sys/dev/pci/ichsmb.c:1.59
--- src/sys/dev/pci/ichsmb.c:1.58 Sun Dec 9 19:16:10 2018
+++ src/sys/dev/pci/ichsmb.c Sun Dec 9 19:21:17 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ichsmb.c,v 1.58 2018/12/09 19:16:10 jdolecek Exp $ */
+/* $NetBSD: ichsmb.c,v 1.59 2018/12/09 19:21:17 jdolecek Exp $ */
/* $OpenBSD: ichiic.c,v 1.18 2007/05/03 09:36:26 dlg Exp $ */
/*
@@ -22,7 +22,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ichsmb.c,v 1.58 2018/12/09 19:16:10 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ichsmb.c,v 1.59 2018/12/09 19:21:17 jdolecek Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -91,7 +91,7 @@ static int ichsmb_intr(void *);
CFATTACH_DECL3_NEW(ichsmb, sizeof(struct ichsmb_softc),
ichsmb_match, ichsmb_attach, ichsmb_detach, NULL, ichsmb_rescan,
- ichsmb_chdet, 0);
+ ichsmb_chdet, DVF_DETACH_SHUTDOWN);
static int
