From a7f12fce22ec06b2f49965cf7ba66183849ae664 Mon Sep 17 00:00:00 2001 From: Gleb Smirnoff Date: Wed, 22 Jan 2020 05:47:59 +0000 Subject: [PATCH] Remove struct callout_handle. Should have gone with r355732. --- ObsoleteFiles.inc | 1 + share/man/man9/Makefile | 1 - share/man/man9/callout.9 | 6 ------ sys/sys/callout.h | 4 ---- 4 files changed, 1 insertion(+), 11 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 40bcf403ad4..b961b53ab09 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -282,6 +282,7 @@ OLD_DIRS+=usr/lib/clang/9.0.0 # 20191214: Removal of sranddev(3) OLD_FILES+=usr/share/man/man3/sranddev.3.gz # 20191213: remove timeout(9) +OLD_FILES+=usr/share/man/man9/callout_handle_init.9.gz OLD_FILES+=usr/share/man/man9/timeout.9.gz OLD_FILES+=usr/share/man/man9/untimeout.9.gz # 20191128: Removal of trm(4) diff --git a/share/man/man9/Makefile b/share/man/man9/Makefile index 3e77d732150..bb203eab9d0 100644 --- a/share/man/man9/Makefile +++ b/share/man/man9/Makefile @@ -770,7 +770,6 @@ MLINKS+=callout.9 callout_active.9 \ callout.9 callout_async_drain.9 \ callout.9 callout_deactivate.9 \ callout.9 callout_drain.9 \ - callout.9 callout_handle_init.9 \ callout.9 callout_init.9 \ callout.9 callout_init_mtx.9 \ callout.9 callout_init_rm.9 \ diff --git a/share/man/man9/callout.9 b/share/man/man9/callout.9 index 26130bfd5fd..9e0cf5e6dc5 100644 --- a/share/man/man9/callout.9 +++ b/share/man/man9/callout.9 @@ -37,7 +37,6 @@ .Nm callout_deactivate , .Nm callout_async_drain , .Nm callout_drain , -.Nm callout_handle_init , .Nm callout_init , .Nm callout_init_mtx , .Nm callout_init_rm , @@ -73,11 +72,6 @@ typedef void callout_func_t (void *); .Ft int .Fn callout_drain "struct callout *c" .Ft void -.Fn callout_handle_init "struct callout_handle *handle" -.Bd -literal -struct callout_handle handle = CALLOUT_HANDLE_INITIALIZER(&handle); -.Ed -.Ft void .Fn callout_init "struct callout *c" "int mpsafe" .Ft void .Fn callout_init_mtx "struct callout *c" "struct mtx *mtx" "int flags" diff --git a/sys/sys/callout.h b/sys/sys/callout.h index e4d91c69da3..41b47a32d9a 100644 --- a/sys/sys/callout.h +++ b/sys/sys/callout.h @@ -62,10 +62,6 @@ #define C_PRECALC 0x0400 /* event time is pre-calculated. */ #define C_CATCH 0x0800 /* catch signals, used by pause_sbt(9) */ -struct callout_handle { - struct callout *callout; -}; - /* Flags for callout_stop_safe() */ #define CS_DRAIN 0x0001 /* callout_drain(), wait allowed */ #define CS_EXECUTING 0x0002 /* Positive return value indicates that -- 2.45.0