Module Name: src
Committed By: skrll
Date: Tue Aug 25 13:50:00 UTC 2020
Modified Files:
src/sys/dev/raidframe: rf_netbsdkintf.c
Log Message:
KNF
To generate a diff of this commit:
cvs rdiff -u -r1.388 -r1.389 src/sys/dev/raidframe/rf_netbsdkintf.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/raidframe/rf_netbsdkintf.c
diff -u src/sys/dev/raidframe/rf_netbsdkintf.c:1.388 src/sys/dev/raidframe/rf_netbsdkintf.c:1.389
--- src/sys/dev/raidframe/rf_netbsdkintf.c:1.388 Fri Jul 31 20:35:33 2020
+++ src/sys/dev/raidframe/rf_netbsdkintf.c Tue Aug 25 13:50:00 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_netbsdkintf.c,v 1.388 2020/07/31 20:35:33 christos Exp $ */
+/* $NetBSD: rf_netbsdkintf.c,v 1.389 2020/08/25 13:50:00 skrll Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2008-2011 The NetBSD Foundation, Inc.
@@ -101,7 +101,7 @@
***********************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.388 2020/07/31 20:35:33 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.389 2020/08/25 13:50:00 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_raid_autoconfig.h"
@@ -404,7 +404,7 @@ rf_autoconfig(device_t self)
RF_ConfigSet_t *config_sets;
if (!raidautoconfig || raidautoconfigdone == true)
- return (0);
+ return 0;
/* XXX This code can only be run once. */
raidautoconfigdone = true;
@@ -787,7 +787,7 @@ raidopen(dev_t dev, int flags, int fmt,
if ((rs = raidget(unit, true)) == NULL)
return ENXIO;
if ((error = raidlock(rs)) != 0)
- return (error);
+ return error;
if ((rs->sc_flags & RAIDF_SHUTDOWN) != 0) {
error = EBUSY;
@@ -818,7 +818,7 @@ raidopen(dev_t dev, int flags, int fmt,
bad:
raidunlock(rs);
- return (error);
+ return error;
}
@@ -858,7 +858,7 @@ raidclose(dev_t dev, int flags, int fmt,
dksc = &rs->sc_dksc;
if ((error = raidlock(rs)) != 0)
- return (error);
+ return error;
if ((rs->sc_flags & RAIDF_INITED) != 0) {
error = dk_close(dksc, dev, flags, fmt, l);
@@ -879,7 +879,7 @@ raidclose(dev_t dev, int flags, int fmt,
raidput(rs);
}
- return (error);
+ return error;
}
@@ -974,9 +974,9 @@ raidread(dev_t dev, struct uio *uio, int
return ENXIO;
if ((rs->sc_flags & RAIDF_INITED) == 0)
- return (ENXIO);
+ return ENXIO;
- return (physio(raidstrategy, NULL, dev, B_READ, minphys, uio));
+ return physio(raidstrategy, NULL, dev, B_READ, minphys, uio);
}
@@ -991,9 +991,9 @@ raidwrite(dev_t dev, struct uio *uio, in
return ENXIO;
if ((rs->sc_flags & RAIDF_INITED) == 0)
- return (ENXIO);
+ return ENXIO;
- return (physio(raidstrategy, NULL, dev, B_WRITE, minphys, uio));
+ return physio(raidstrategy, NULL, dev, B_WRITE, minphys, uio);
}
@@ -1742,7 +1742,7 @@ raidioctl(dev_t dev, u_long cmd, void *d
}
if (!raidPtr->valid)
- return (EINVAL);
+ return EINVAL;
/*
* Add support for "regular" device ioctls here.
@@ -1762,7 +1762,7 @@ raidioctl(dev_t dev, u_long cmd, void *d
break;
}
- return (retcode);
+ return retcode;
}
@@ -1858,7 +1858,7 @@ rf_GetSpareTableFromDaemon(RF_SparetWait
retcode = req->fcol;
RF_Free(req, sizeof(*req)); /* this is not the same req as we
* alloc'd */
- return (retcode);
+ return retcode;
}
#endif
@@ -2043,7 +2043,7 @@ rf_DispatchKernelIO(RF_DiskQueue_t *queu
}
db1_printf(("Exiting from DispatchKernelIO\n"));
- return (0);
+ return 0;
}
/* this is the callback function associated with a I/O invoked from
kernel code.
@@ -2164,7 +2164,7 @@ raidlock(struct raid_softc *rs)
rs->sc_flags |= RAIDF_LOCKED;
done:
mutex_exit(&rs->sc_mutex);
- return (error);
+ return error;
}
/*
* Unlock and wake up any waiters.
@@ -3577,7 +3577,7 @@ raid_detach(device_t self, int flags)
return ENXIO;
if ((error = raidlock(rs)) != 0)
- return (error);
+ return error;
error = raid_detach_unlocked(rs);
@@ -3755,14 +3755,14 @@ rf_get_info(RF_Raid_t *raidPtr, RF_Devic
int d, i, j;
if (!raidPtr->valid)
- return (ENODEV);
+ return ENODEV;
config->cols = raidPtr->numCol;
config->ndevs = raidPtr->numCol;
if (config->ndevs >= RF_MAX_DISKS)
- return (ENOMEM);
+ return ENOMEM;
config->nspares = raidPtr->numSpare;
if (config->nspares >= RF_MAX_DISKS)
- return (ENOMEM);
+ return ENOMEM;
config->maxqdepth = raidPtr->maxQueueDepth;
d = 0;
for (j = 0; j < config->cols; j++) {
