From c154cad532e4b786925d4fdda2cd57da7e6c12eb Mon Sep 17 00:00:00 2001 From: Mitchell Horne Date: Thu, 23 Nov 2023 11:22:33 -0400 Subject: [PATCH] hptmv: remove vestigial EVENTHANDLER_DEREGISTER() The registration was removed in favor of DEVICE_SHUTDOWN(). Drop the unused eventhandler tag from the IAL_ADAPTER_T structure. Reviewed by: jhb Sponsored by: The FreeBSD Foundation MFC after: 3 days Fixes: cd3ef66680a8 ("Use DEVICE_SHUTDOWN(9) mechanism...") Differential Revision: https://reviews.freebsd.org/D42334 (cherry picked from commit a4b19cf5c76ac66d02a3ef8a549115ba865d630c) --- sys/dev/hptmv/entry.c | 1 - sys/dev/hptmv/osbsd.h | 2 -- 2 files changed, 3 deletions(-) diff --git a/sys/dev/hptmv/entry.c b/sys/dev/hptmv/entry.c index fd3b808e1e7..0157a27c372 100644 --- a/sys/dev/hptmv/entry.c +++ b/sys/dev/hptmv/entry.c @@ -2155,7 +2155,6 @@ hpt_shutdown(device_t dev) pAdapter = device_get_softc(dev); - EVENTHANDLER_DEREGISTER(shutdown_final, pAdapter->eh); mtx_lock(&pAdapter->lock); FlushAdapter(pAdapter); mtx_unlock(&pAdapter->lock); diff --git a/sys/dev/hptmv/osbsd.h b/sys/dev/hptmv/osbsd.h index a9240af16c8..0e4d94fb475 100644 --- a/sys/dev/hptmv/osbsd.h +++ b/sys/dev/hptmv/osbsd.h @@ -190,8 +190,6 @@ typedef struct IALAdapter UCHAR status; UCHAR ver_601; UCHAR beeping; - - eventhandler_tag eh; } IAL_ADAPTER_T;