Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev dk_ioctl already calls disk_ioctl.



details:   https://anonhg.NetBSD.org/src/rev/133782c61c2d
branches:  trunk
changeset: 813935:133782c61c2d
user:      mlelstv <mlelstv%NetBSD.org@localhost>
date:      Sat Feb 27 08:54:49 2016 +0000

description:
dk_ioctl already calls disk_ioctl.
Remove redundant return statement for a void function.

diffstat:

 sys/dev/ld.c |  10 +++-------
 1 files changed, 3 insertions(+), 7 deletions(-)

diffs (38 lines):

diff -r 20507dc0b84c -r 133782c61c2d sys/dev/ld.c
--- a/sys/dev/ld.c      Sat Feb 27 00:54:59 2016 +0000
+++ b/sys/dev/ld.c      Sat Feb 27 08:54:49 2016 +0000
@@ -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 @@
        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 @@
        sc = device_lookup_private(&ld_cd, unit);
        dksc = &sc->sc_dksc;
 
-       return dk_strategy(dksc, bp);
+       dk_strategy(dksc, bp);
 }
 
 static int



Home | Main Index | Thread Index | Old Index