svn commit: r356973 - in head: . share/man/man9 sys/sys

[Gleb Smirnoff]

Author: glebius
Date: Wed Jan 22 05:47:59 2020
New Revision: 356973
URL: https://svnweb.freebsd.org/changeset/base/356973

Log:
  Remove struct callout_handle.  Should have gone with r355732.

Modified:
  head/ObsoleteFiles.inc
  head/share/man/man9/Makefile
  head/share/man/man9/callout.9
  head/sys/sys/callout.h

Modified: head/ObsoleteFiles.inc
==============================================================================
--- head/ObsoleteFiles.inc	Wed Jan 22 05:32:23 2020	(r356972)
+++ head/ObsoleteFiles.inc	Wed Jan 22 05:47:59 2020	(r356973)
@@ -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)

Modified: head/share/man/man9/Makefile
==============================================================================
--- head/share/man/man9/Makefile	Wed Jan 22 05:32:23 2020	(r356972)
+++ head/share/man/man9/Makefile	Wed Jan 22 05:47:59 2020	(r356973)
@@ -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 \

Modified: head/share/man/man9/callout.9
==============================================================================
--- head/share/man/man9/callout.9	Wed Jan 22 05:32:23 2020	(r356972)
+++ head/share/man/man9/callout.9	Wed Jan 22 05:47:59 2020	(r356973)
@@ -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 ,
@@ -72,11 +71,6 @@ typedef void callout_func_t (void *);
 .Fn callout_async_drain "struct callout *c" "callout_func_t *drain"
 .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

Modified: head/sys/sys/callout.h
==============================================================================
--- head/sys/sys/callout.h	Wed Jan 22 05:32:23 2020	(r356972)
+++ head/sys/sys/callout.h	Wed Jan 22 05:47:59 2020	(r356973)
@@ -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