summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorriastradh <riastradh@NetBSD.org>2021-06-12 15:49:45 +0000
committerriastradh <riastradh@NetBSD.org>2021-06-12 15:49:45 +0000
commit2c91f520bf5fee9d770cfee3dd36663970e3ec7b (patch)
treec4be4face23e05d13c5f151af73271a8b4fe076f /sys/dev
parent48c8cd496b98f13cefa4c3dfa75210509807b607 (diff)
usb(4): Nix unused struct usbd_interface::ui_priv.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/usb/usb_subr.c6
-rw-r--r--sys/dev/usb/usbdi.c8
-rw-r--r--sys/dev/usb/usbdivar.h3
3 files changed, 7 insertions, 10 deletions
diff --git a/sys/dev/usb/usb_subr.c b/sys/dev/usb/usb_subr.c
index adfdf01c970..e4d61189c88 100644
--- a/sys/dev/usb/usb_subr.c
+++ b/sys/dev/usb/usb_subr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: usb_subr.c,v 1.259 2021/06/12 15:41:22 riastradh Exp $ */
+/* $NetBSD: usb_subr.c,v 1.260 2021/06/12 15:49:45 riastradh Exp $ */
/* $FreeBSD: src/sys/dev/usb/usb_subr.c,v 1.18 1999/11/17 22:33:47 n_hibma Exp $ */
/*
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usb_subr.c,v 1.259 2021/06/12 15:41:22 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usb_subr.c,v 1.260 2021/06/12 15:49:45 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -415,7 +415,6 @@ usbd_iface_init(struct usbd_device *dev, int ifaceidx)
ifc->ui_index = 0;
ifc->ui_altindex = 0;
ifc->ui_endpoints = NULL;
- ifc->ui_priv = NULL;
LIST_INIT(&ifc->ui_pipes);
mutex_init(&ifc->ui_pipelock, MUTEX_DEFAULT, IPL_NONE);
}
@@ -430,7 +429,6 @@ usbd_iface_fini(struct usbd_device *dev, int ifaceidx)
KASSERT(ifc->ui_index == 0);
KASSERT(ifc->ui_altindex == 0);
KASSERT(ifc->ui_endpoints == NULL);
- KASSERT(ifc->ui_priv == NULL);
KASSERT(LIST_EMPTY(&ifc->ui_pipes));
mutex_destroy(&ifc->ui_pipelock);
diff --git a/sys/dev/usb/usbdi.c b/sys/dev/usb/usbdi.c
index 27801da65b6..8abd82510f1 100644
--- a/sys/dev/usb/usbdi.c
+++ b/sys/dev/usb/usbdi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: usbdi.c,v 1.214 2021/06/12 15:41:22 riastradh Exp $ */
+/* $NetBSD: usbdi.c,v 1.215 2021/06/12 15:49:45 riastradh Exp $ */
/*
* Copyright (c) 1998, 2012, 2015 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.214 2021/06/12 15:41:22 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.215 2021/06/12 15:49:45 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -141,8 +141,8 @@ usbd_dump_iface(struct usbd_interface *iface)
USBHIST_LOG(usbdebug, " device = %#jx idesc = %#jx index = %jd",
(uintptr_t)iface->ui_dev, (uintptr_t)iface->ui_idesc,
iface->ui_index, 0);
- USBHIST_LOG(usbdebug, " altindex=%jd priv=%#jx",
- iface->ui_altindex, (uintptr_t)iface->ui_priv, 0, 0);
+ USBHIST_LOG(usbdebug, " altindex=%jd",
+ iface->ui_altindex, 0, 0, 0);
}
void
diff --git a/sys/dev/usb/usbdivar.h b/sys/dev/usb/usbdivar.h
index 615e854264d..85bbc1999c5 100644
--- a/sys/dev/usb/usbdivar.h
+++ b/sys/dev/usb/usbdivar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: usbdivar.h,v 1.126 2021/06/12 14:43:27 riastradh Exp $ */
+/* $NetBSD: usbdivar.h,v 1.127 2021/06/12 15:49:45 riastradh Exp $ */
/*
* Copyright (c) 1998, 2012 The NetBSD Foundation, Inc.
@@ -230,7 +230,6 @@ struct usbd_interface {
int ui_index;
int ui_altindex;
struct usbd_endpoint *ui_endpoints;
- void *ui_priv;
kmutex_t ui_pipelock;
LIST_HEAD(, usbd_pipe) ui_pipes;
};