From 4a331aac448bc6ebd006fa2ea80af68f57c666eb Mon Sep 17 00:00:00 2001 From: christos Date: Wed, 31 Dec 2014 19:52:04 +0000 Subject: make more drivers use disk_ioctl, and add a dev parameter to it so that we can merge the "easy" disklabel ioctls to it. Ultimately all this will go do dk_ioctl once all the drivers have been converted. --- sys/dev/mca/ed_mca.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) (limited to 'sys/dev/mca') diff --git a/sys/dev/mca/ed_mca.c b/sys/dev/mca/ed_mca.c index 3aecb2bf506..65bd1deafab 100644 --- a/sys/dev/mca/ed_mca.c +++ b/sys/dev/mca/ed_mca.c @@ -1,4 +1,4 @@ -/* $NetBSD: ed_mca.c,v 1.60 2014/12/31 17:06:48 christos Exp $ */ +/* $NetBSD: ed_mca.c,v 1.61 2014/12/31 19:52:05 christos Exp $ */ /* * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ed_mca.c,v 1.60 2014/12/31 17:06:48 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ed_mca.c,v 1.61 2014/12/31 19:52:05 christos Exp $"); #include #include @@ -478,21 +478,11 @@ edmcaioctl(dev_t dev, u_long xfer, void *addr, int flag, struct lwp *l) if ((ed->sc_flags & WDF_LOADED) == 0) return EIO; - error = disk_ioctl(&ed->sc_dk, xfer, addr, flag, l); + error = disk_ioctl(&ed->sc_dk, dev, xfer, addr, flag, l); if (error != EPASSTHROUGH) return error; switch (xfer) { - case DIOCGDINFO: - *(struct disklabel *)addr = *(ed->sc_dk.dk_label); - return 0; - - case DIOCGPART: - ((struct partinfo *)addr)->disklab = ed->sc_dk.dk_label; - ((struct partinfo *)addr)->part = - &ed->sc_dk.dk_label->d_partitions[DISKPART(dev)]; - return 0; - case DIOCWDINFO: case DIOCSDINFO: { -- cgit