[src/trunk]: src/sys these call dk_ioctl, no need to call disk_ioctl anymore.

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/dcdbc61f24b5
branches:  trunk
changeset: 335288:dcdbc61f24b5
user:      christos <christos%NetBSD.org@localhost>
date:      Fri Jan 02 01:13:00 2015 +0000

description:
these call dk_ioctl, no need to call disk_ioctl anymore.

diffstat:

 sys/arch/xen/xen/xbd_xenbus.c |  8 ++------
 sys/dev/cgd.c                 |  9 ++-------
 2 files changed, 4 insertions(+), 13 deletions(-)

diffs (66 lines):

diff -r c7e2e87623d9 -r dcdbc61f24b5 sys/arch/xen/xen/xbd_xenbus.c
--- a/sys/arch/xen/xen/xbd_xenbus.c     Fri Jan 02 00:50:56 2015 +0000
+++ b/sys/arch/xen/xen/xbd_xenbus.c     Fri Jan 02 01:13:00 2015 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: xbd_xenbus.c,v 1.67 2014/12/31 20:39:07 christos Exp $      */
+/*      $NetBSD: xbd_xenbus.c,v 1.68 2015/01/02 01:13:00 christos Exp $      */
 
 /*
  * Copyright (c) 2006 Manuel Bouyer.
@@ -50,7 +50,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xbd_xenbus.c,v 1.67 2014/12/31 20:39:07 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xbd_xenbus.c,v 1.68 2015/01/02 01:13:00 christos Exp $");
 
 #include "opt_xen.h"
 
@@ -847,10 +847,6 @@
            dev, cmd, data, flag, l));
        dksc = &sc->sc_dksc;
 
-       error = disk_ioctl(&sc->sc_dksc.sc_dkdev, dev, cmd, data, flag, l);
-       if (error != EPASSTHROUGH)
-               return (error);
-
        switch (cmd) {
        case DIOCSSTRATEGY:
                error = EOPNOTSUPP;
diff -r c7e2e87623d9 -r dcdbc61f24b5 sys/dev/cgd.c
--- a/sys/dev/cgd.c     Fri Jan 02 00:50:56 2015 +0000
+++ b/sys/dev/cgd.c     Fri Jan 02 01:13:00 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: cgd.c,v 1.94 2014/12/31 19:52:05 christos Exp $ */
+/* $NetBSD: cgd.c,v 1.95 2015/01/02 01:13:00 christos Exp $ */
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cgd.c,v 1.94 2014/12/31 19:52:05 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cgd.c,v 1.95 2015/01/02 01:13:00 christos Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -548,7 +548,6 @@
        struct  dk_softc *dksc;
        int     part = DISKPART(dev);
        int     pmask = 1 << part;
-       int     error;
 
        DPRINTF_FOLLOW(("cgdioctl(0x%"PRIx64", %ld, %p, %d, %p)\n",
            dev, cmd, data, flag, l));
@@ -567,10 +566,6 @@
                break;
        }
 
-       error = disk_ioctl(&dksc->sc_dkdev, dev, cmd, data, flag, l);
-       if (error != EPASSTHROUGH)
-               return (error);
-
        switch (cmd) {
        case CGDIOCSET:
                if (dksc->sc_flags & DKF_INITED)