Module Name: src
Committed By: mlelstv
Date: Sat Feb 27 08:54:49 UTC 2016
Modified Files:
src/sys/dev: ld.c
Log Message:
dk_ioctl already calls disk_ioctl.
Remove redundant return statement for a void function.
To generate a diff of this commit:
cvs rdiff -u -r1.93 -r1.94 src/sys/dev/ld.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/ld.c
diff -u src/sys/dev/ld.c:1.93 src/sys/dev/ld.c:1.94
--- src/sys/dev/ld.c:1.93 Fri Aug 28 17:41:49 2015
+++ src/sys/dev/ld.c Sat Feb 27 08:54:49 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: ld.c,v 1.93 2015/08/28 17:41:49 mlelstv Exp $ */
+/* $NetBSD: ld.c,v 1.94 2016/02/27 08:54:49 mlelstv Exp $ */
/*-
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ld.c,v 1.93 2015/08/28 17:41:49 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ld.c,v 1.94 2016/02/27 08:54:49 mlelstv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -353,10 +353,6 @@ ldioctl(dev_t dev, u_long cmd, void *add
sc = device_lookup_private(&ld_cd, unit);
dksc = &sc->sc_dksc;
- error = disk_ioctl(&dksc->sc_dkdev, dev, cmd, addr, flag, l);
- if (error != EPASSTHROUGH)
- return (error);
-
error = dk_ioctl(dksc, dev, cmd, addr, flag, l);
if (error != EPASSTHROUGH)
return (error);
@@ -395,7 +391,7 @@ ldstrategy(struct buf *bp)
sc = device_lookup_private(&ld_cd, unit);
dksc = &sc->sc_dksc;
- return dk_strategy(dksc, bp);
+ dk_strategy(dksc, bp);
}
static int
