summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authormycroft <mycroft@NetBSD.org>1997-03-12 22:31:37 +0000
committermycroft <mycroft@NetBSD.org>1997-03-12 22:31:37 +0000
commit8f8b0d91e5129b398e312c0cbac2c40a9e307663 (patch)
tree959f10399258711ed94f1b6aad95fc845b1ed1e2 /sys/dev
parent2330e40bc93ed8d81842b002eab66851e5c71bf2 (diff)
Remove bogus use of splhigh(), and apparently unneeded bzero().
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/ccd.c8
-rw-r--r--sys/dev/vnd.c8
2 files changed, 4 insertions, 12 deletions
diff --git a/sys/dev/ccd.c b/sys/dev/ccd.c
index 4d9233fcd3d..87e55a63101 100644
--- a/sys/dev/ccd.c
+++ b/sys/dev/ccd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ccd.c,v 1.38 1997/01/30 04:00:52 thorpej Exp $ */
+/* $NetBSD: ccd.c,v 1.39 1997/03/12 22:31:37 mycroft Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -1060,7 +1060,7 @@ ccdioctl(dev, cmd, data, flag, p)
{
int unit = ccdunit(dev);
int i, j, lookedup = 0, error = 0;
- int part, pmask, s;
+ int part, pmask;
struct ccd_softc *cs;
struct ccd_ioctl *ccio = (struct ccd_ioctl *)data;
struct ccddevice ccd;
@@ -1241,11 +1241,7 @@ ccdioctl(dev, cmd, data, flag, p)
/* Detatch the disk. */
disk_detach(&cs->sc_dkdev);
- /* This must be atomic. */
- s = splhigh();
ccdunlock(cs);
- bzero(cs, sizeof(struct ccd_softc));
- splx(s);
break;
diff --git a/sys/dev/vnd.c b/sys/dev/vnd.c
index ab7cdd08f7e..9ed4d303ac7 100644
--- a/sys/dev/vnd.c
+++ b/sys/dev/vnd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: vnd.c,v 1.31 1997/01/31 05:18:51 thorpej Exp $ */
+/* $NetBSD: vnd.c,v 1.32 1997/03/12 22:31:40 mycroft Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -510,7 +510,7 @@ vndioctl(dev, cmd, data, flag, p)
struct vnd_ioctl *vio;
struct vattr vattr;
struct nameidata nd;
- int error, part, pmask, s;
+ int error, part, pmask;
#ifdef DEBUG
if (vnddebug & VDB_FOLLOW)
@@ -609,11 +609,7 @@ vndioctl(dev, cmd, data, flag, p)
/* Detatch the disk. */
disk_detach(&vnd->sc_dkdev);
- /* This must be atomic. */
- s = splhigh();
vndunlock(vnd);
- bzero(vnd, sizeof(struct vnd_softc));
- splx(s);
break;