summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
authorKenneth R Westerback <krw@cvs.openbsd.org>2022-10-23 19:33:40 +0000
committerKenneth R Westerback <krw@cvs.openbsd.org>2022-10-23 19:33:40 +0000
commit45b4666a028b3c85e06a27f84dc5cd0ea3ef15bd (patch)
tree24c74aede33850dc9a4b3f3dc769bc410ee430df /sys/arch
parent9bd9103ede68c55a24978c2fabb2881a8b0a5dd6 (diff)
bzero(disklabel) or memset(disklabel,0) should be enough for
anyone. No need to also set d_flags to 0.
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/octeon/dev/amdcf.c3
-rw-r--r--sys/arch/octeon/dev/octcf.c3
2 files changed, 2 insertions, 4 deletions
diff --git a/sys/arch/octeon/dev/amdcf.c b/sys/arch/octeon/dev/amdcf.c
index f3053f19d9a..35a60f03fb4 100644
--- a/sys/arch/octeon/dev/amdcf.c
+++ b/sys/arch/octeon/dev/amdcf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: amdcf.c,v 1.8 2022/04/06 18:59:26 naddy Exp $ */
+/* $OpenBSD: amdcf.c,v 1.9 2022/10/23 19:33:39 krw Exp $ */
/*
* Copyright (c) 2007, Juniper Networks, Inc.
@@ -381,7 +381,6 @@ amdcfgetdisklabel(dev_t dev, struct amdcf_softc *sc, struct disklabel *lp,
lp->d_type = DTYPE_SCSI; /* bogus type, can be anything */
strlcpy(lp->d_packname, "CFI Disk", sizeof(lp->d_packname));
DL_SETDSIZE(lp, sc->sc_size / DEV_BSIZE);
- lp->d_flags = 0;
lp->d_version = 1;
lp->d_magic = DISKMAGIC;
diff --git a/sys/arch/octeon/dev/octcf.c b/sys/arch/octeon/dev/octcf.c
index de167f8b5ae..002d82d07c6 100644
--- a/sys/arch/octeon/dev/octcf.c
+++ b/sys/arch/octeon/dev/octcf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: octcf.c,v 1.34 2022/04/06 18:59:27 naddy Exp $ */
+/* $OpenBSD: octcf.c,v 1.35 2022/10/23 19:33:39 krw Exp $ */
/* $NetBSD: wd.c,v 1.193 1999/02/28 17:15:27 explorer Exp $ */
/*
@@ -515,7 +515,6 @@ octcfgetdefaultlabel(struct octcf_softc *wd, struct disklabel *lp)
/* XXX - user viscopy() like sd.c */
strncpy(lp->d_packname, wd->sc_params.atap_model, sizeof lp->d_packname);
- lp->d_flags = 0;
lp->d_version = 1;
lp->d_magic = DISKMAGIC;