Module Name: src
Committed By: riastradh
Date: Sat Jun 12 15:49:45 UTC 2021
Modified Files:
src/sys/dev/usb: usb_subr.c usbdi.c usbdivar.h
Log Message:
usb(4): Nix unused struct usbd_interface::ui_priv.
To generate a diff of this commit:
cvs rdiff -u -r1.259 -r1.260 src/sys/dev/usb/usb_subr.c
cvs rdiff -u -r1.214 -r1.215 src/sys/dev/usb/usbdi.c
cvs rdiff -u -r1.126 -r1.127 src/sys/dev/usb/usbdivar.h
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/usb/usb_subr.c
diff -u src/sys/dev/usb/usb_subr.c:1.259 src/sys/dev/usb/usb_subr.c:1.260
--- src/sys/dev/usb/usb_subr.c:1.259 Sat Jun 12 15:41:22 2021
+++ src/sys/dev/usb/usb_subr.c Sat Jun 12 15:49:45 2021
@@ -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,
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,
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);
Index: src/sys/dev/usb/usbdi.c
diff -u src/sys/dev/usb/usbdi.c:1.214 src/sys/dev/usb/usbdi.c:1.215
--- src/sys/dev/usb/usbdi.c:1.214 Sat Jun 12 15:41:22 2021
+++ src/sys/dev/usb/usbdi.c Sat Jun 12 15:49:45 2021
@@ -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 *i
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
Index: src/sys/dev/usb/usbdivar.h
diff -u src/sys/dev/usb/usbdivar.h:1.126 src/sys/dev/usb/usbdivar.h:1.127
--- src/sys/dev/usb/usbdivar.h:1.126 Sat Jun 12 14:43:27 2021
+++ src/sys/dev/usb/usbdivar.h Sat Jun 12 15:49:45 2021
@@ -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;
};
