diff options
| author |   krw <krw@openbsd.org> | 2020-03-21 20:42:23 +0000 |
|---|---|---|
| committer | krw <krw@openbsd.org> | 2020-03-21 20:42:23 +0000 |
| commit | cac0897d211a572017c3b1345d487350036eaf90 (patch) | |
| tree | 2f944dd5b398305c38ed2fdcf30f61268d9e71ec | |
| parent | r1.244 introduced rt_hash() with careful checks of src for NULL at (diff) | |
| download | wireguard-openbsd-cac0897d211a572017c3b1345d487350036eaf90.tar.xz wireguard-openbsd-cac0897d211a572017c3b1345d487350036eaf90.zip | |
Simplify some goto'ing that jumps a single line or
does nothing at all.
The first one spotted as CID 1452976.
Reads good to millert@
ok mpi@
| -rw-r--r-- | sys/dev/ic/mfi.c | 18 | ||||
| -rw-r--r-- | sys/dev/pci/mfii.c | 7 |
2 files changed, 9 insertions, 16 deletions
diff --git a/sys/dev/ic/mfi.c b/sys/dev/ic/mfi.c index 04c69d13c22..3104dcea990 100644 --- a/sys/dev/ic/mfi.c +++ b/sys/dev/ic/mfi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mfi.c,v 1.175 2020/02/13 15:11:32 krw Exp $ */ +/* $OpenBSD: mfi.c,v 1.176 2020/03/21 20:42:23 krw Exp $ */ /* * Copyright (c) 2006 Marco Peereboom <marco@peereboom.us> * @@ -1499,9 +1499,9 @@ mfi_ioctl_cache(struct scsi_link *link, u_long cmd, struct dk_cache *dc) ldp.mlp_diskcache_policy = MR_LD_DISK_CACHE_DISABLE; } - if ((rv = mfi_mgmt(sc, MR_DCMD_LD_SET_PROPERTIES, MFI_DATA_OUT, - sizeof(ldp), &ldp, &mbox)) != 0) - goto done; + rv = mfi_mgmt(sc, MR_DCMD_LD_SET_PROPERTIES, MFI_DATA_OUT, sizeof(ldp), + &ldp, &mbox); + done: return (rv); } @@ -1990,10 +1990,8 @@ mfi_ioctl_blink(struct mfi_softc *sc, struct bioc_blink *bb) } - if (mfi_mgmt(sc, cmd, MFI_DATA_NONE, 0, NULL, &mbox)) - goto done; + rv = mfi_mgmt(sc, cmd, MFI_DATA_NONE, 0, NULL, &mbox); - rv = 0; done: free(pd, M_DEVBUF, sizeof *pd); return (rv); @@ -2060,12 +2058,8 @@ mfi_ioctl_setstate(struct mfi_softc *sc, struct bioc_setstate *bs) goto done; } + rv = mfi_mgmt(sc, MR_DCMD_PD_SET_STATE, MFI_DATA_NONE, 0, NULL, &mbox); - if ((rv = mfi_mgmt(sc, MR_DCMD_PD_SET_STATE, MFI_DATA_NONE, 0, NULL, - &mbox))) - goto done; - - rv = 0; done: free(pd, M_DEVBUF, sizeof *pd); free(info, M_DEVBUF, sizeof *info); diff --git a/sys/dev/pci/mfii.c b/sys/dev/pci/mfii.c index 95b98ce35dd..67f3f4eb6f2 100644 --- a/sys/dev/pci/mfii.c +++ b/sys/dev/pci/mfii.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mfii.c,v 1.67 2020/02/05 16:29:30 krw Exp $ */ +/* $OpenBSD: mfii.c,v 1.68 2020/03/21 20:42:23 krw Exp $ */ /* * Copyright (c) 2012 David Gwynne <dlg@openbsd.org> @@ -3289,10 +3289,9 @@ mfii_ioctl_blink(struct mfii_softc *sc, struct bioc_blink *bb) } - if (mfii_mgmt(sc, cmd, &mbox, NULL, 0, 0)) - goto done; + if (mfii_mgmt(sc, cmd, &mbox, NULL, 0, 0) == 0) + rv = 0; - rv = 0; done: free(pd, M_DEVBUF, sizeof *pd); return (rv); |