Module Name: src
Committed By: cnst
Date: Wed May 8 06:32:01 UTC 2019
Modified Files:
src/sys/dev/ic: mpt_netbsd.c
Log Message:
mpt(4): remove ENOTTY / noop implementation of bio(4) setstate
* All other bio(4) drivers either do or don't implement each command.
* This changes the returned error code, but it does not seem to matter,
as some bio(4) drivers always return ENOTTY in the default case, whilst
others always return EINVAL (e.g., both cac(4) and ciss(4) for setstate).
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/sys/dev/ic/mpt_netbsd.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/ic/mpt_netbsd.c
diff -u src/sys/dev/ic/mpt_netbsd.c:1.35 src/sys/dev/ic/mpt_netbsd.c:1.36
--- src/sys/dev/ic/mpt_netbsd.c:1.35 Mon Feb 5 22:14:26 2018
+++ src/sys/dev/ic/mpt_netbsd.c Wed May 8 06:32:01 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: mpt_netbsd.c,v 1.35 2018/02/05 22:14:26 mrg Exp $ */
+/* $NetBSD: mpt_netbsd.c,v 1.36 2019/05/08 06:32:01 cnst Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mpt_netbsd.c,v 1.35 2018/02/05 22:14:26 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpt_netbsd.c,v 1.36 2019/05/08 06:32:01 cnst Exp $");
#include "bio.h"
@@ -113,7 +113,6 @@ static int mpt_bio_ioctl_inq(mpt_softc_t
static int mpt_bio_ioctl_vol(mpt_softc_t *, struct bioc_vol *);
static int mpt_bio_ioctl_disk(mpt_softc_t *, struct bioc_disk *);
static int mpt_bio_ioctl_disk_novol(mpt_softc_t *, struct bioc_disk *);
-static int mpt_bio_ioctl_setstate(mpt_softc_t *, struct bioc_setstate *);
#endif
void
@@ -1781,9 +1780,6 @@ mpt_bio_ioctl(device_t dev, u_long cmd,
case BIOCDISK:
error = mpt_bio_ioctl_disk(mpt, addr);
break;
- case BIOCSETSTATE:
- error = mpt_bio_ioctl_setstate(mpt, addr);
- break;
default:
error = EINVAL;
break;
@@ -2069,11 +2065,5 @@ fail:
if (ioc2) free(ioc2, M_DEVBUF);
return EINVAL;
}
-
-static int
-mpt_bio_ioctl_setstate(mpt_softc_t *mpt, struct bioc_setstate *bs)
-{
- return ENOTTY;
-}
#endif
