Module Name: src
Committed By: riastradh
Date: Mon Mar 31 14:45:57 UTC 2025
Modified Files:
src/sys/arch/mips/ralink: ralink_ehci.c
src/sys/dev/cardbus: ehci_cardbus.c
src/sys/dev/pci: usb_pci.c
Log Message:
ehci(4): Make usb_*_rem work as noop on zero-initialized input.
This way, if some *hci_attach function fails before usb_*_add, the
caller need not maintain boolean state to decide whether to call
usb_*_rem on detach -- it'll just work without extra effort.
Cleanup in preparation for:
PR port-amd64/59180: System reboots instead of shutting down
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/mips/ralink/ralink_ehci.c
cvs rdiff -u -r1.38 -r1.39 src/sys/dev/cardbus/ehci_cardbus.c
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/pci/usb_pci.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/arch/mips/ralink/ralink_ehci.c
diff -u src/sys/arch/mips/ralink/ralink_ehci.c:1.10 src/sys/arch/mips/ralink/ralink_ehci.c:1.11
--- src/sys/arch/mips/ralink/ralink_ehci.c:1.10 Mon Mar 31 14:45:35 2025
+++ src/sys/arch/mips/ralink/ralink_ehci.c Mon Mar 31 14:45:57 2025
@@ -1,4 +1,4 @@
-/* $NetBSD: ralink_ehci.c,v 1.10 2025/03/31 14:45:35 riastradh Exp $ */
+/* $NetBSD: ralink_ehci.c,v 1.11 2025/03/31 14:45:57 riastradh Exp $ */
/*-
* Copyright (c) 2011 CradlePoint Technology, Inc.
* All rights reserved.
@@ -29,7 +29,7 @@
/* ralink_ehci.c -- Ralink EHCI USB Driver */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ralink_ehci.c,v 1.10 2025/03/31 14:45:35 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ralink_ehci.c,v 1.11 2025/03/31 14:45:57 riastradh Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -217,5 +217,6 @@ ralink_usb_hc_rem(struct ralink_usb_hc *
KASSERT(KERNEL_LOCKED_P()); /* XXXSMP ralink_usb_alldevs */
- TAILQ_REMOVE(&ralink_usb_alldevs, ruh, next);
+ if (ruh->usb)
+ TAILQ_REMOVE(&ralink_usb_alldevs, ruh, next);
}
Index: src/sys/dev/cardbus/ehci_cardbus.c
diff -u src/sys/dev/cardbus/ehci_cardbus.c:1.38 src/sys/dev/cardbus/ehci_cardbus.c:1.39
--- src/sys/dev/cardbus/ehci_cardbus.c:1.38 Mon Mar 31 14:45:35 2025
+++ src/sys/dev/cardbus/ehci_cardbus.c Mon Mar 31 14:45:57 2025
@@ -1,4 +1,4 @@
-/* $NetBSD: ehci_cardbus.c,v 1.38 2025/03/31 14:45:35 riastradh Exp $ */
+/* $NetBSD: ehci_cardbus.c,v 1.39 2025/03/31 14:45:57 riastradh Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ehci_cardbus.c,v 1.38 2025/03/31 14:45:35 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci_cardbus.c,v 1.39 2025/03/31 14:45:57 riastradh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -248,5 +248,6 @@ usb_cardbus_rem(struct usb_cardbus *up)
KASSERT(KERNEL_LOCKED_P()); /* XXXSMP ehci_cardbus_alldevs */
- TAILQ_REMOVE(&ehci_cardbus_alldevs, up, next);
+ if (up->usb)
+ TAILQ_REMOVE(&ehci_cardbus_alldevs, up, next);
}
Index: src/sys/dev/pci/usb_pci.c
diff -u src/sys/dev/pci/usb_pci.c:1.8 src/sys/dev/pci/usb_pci.c:1.9
--- src/sys/dev/pci/usb_pci.c:1.8 Mon Mar 31 14:45:35 2025
+++ src/sys/dev/pci/usb_pci.c Mon Mar 31 14:45:57 2025
@@ -1,4 +1,4 @@
-/* $NetBSD: usb_pci.c,v 1.8 2025/03/31 14:45:35 riastradh Exp $ */
+/* $NetBSD: usb_pci.c,v 1.9 2025/03/31 14:45:57 riastradh Exp $ */
/*
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usb_pci.c,v 1.8 2025/03/31 14:45:35 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usb_pci.c,v 1.9 2025/03/31 14:45:57 riastradh Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -71,5 +71,6 @@ usb_pci_rem(struct usb_pci *up)
KASSERT(KERNEL_LOCKED_P()); /* XXXSMP ehci_pci_alldevs */
- TAILQ_REMOVE(&ehci_pci_alldevs, up, next);
+ if (up->usb)
+ TAILQ_REMOVE(&ehci_pci_alldevs, up, next);
}
