From: Stephen Kitt <steve@sk2.org>
Date: Sun, 26 Jan 2014 20:00:23 +0000 (-0200)
Subject: Remove "rmmod -w" documentation and getopt entry
X-Git-Tag: v17~36
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a4bd1441e5c7e8903a9ae065801d4f06f13d06e9;p=thirdparty%2Fkmod.git

Remove "rmmod -w" documentation and getopt entry

This patch removes the cmdopts declaration and the documentation. They
were leftover from the -w removal.
---

diff --git a/man/rmmod.xml b/man/rmmod.xml
index d9a6295b..14c94dda 100644
--- a/man/rmmod.xml
+++ b/man/rmmod.xml
@@ -39,7 +39,6 @@
     <cmdsynopsis>
       <command>rmmod</command>
       <arg><option>-f</option></arg>
-      <arg><option>-w</option></arg>
       <arg><option>-s</option></arg>
       <arg><option>-v</option></arg>
       <arg><replaceable>modulename</replaceable></arg>
@@ -93,22 +92,6 @@
           </para>
         </listitem>
       </varlistentry>
-      <varlistentry>
-        <term><option>-w</option> <option>--wait</option>
-        </term>
-        <listitem>
-          <para>
-            Normally, <command>rmmod</command> will refuse to unload modules
-            which are in use.  With this option, <command>rmmod</command> will
-            isolate the module, and wait until the module is no longer used.
-            Nothing new will be able to use the module, but it's up to you to
-            make sure the current users eventually finish with it.  See
-            <citerefentry>
-              <refentrytitle>lsmod</refentrytitle><manvolnum>8</manvolnum>
-            </citerefentry>) for information on usage counts.
-          </para>
-        </listitem>
-      </varlistentry>
       <varlistentry>
         <term>
           <option>-s</option>
diff --git a/tools/rmmod.c b/tools/rmmod.c
index fd0fac54..df2f0416 100644
--- a/tools/rmmod.c
+++ b/tools/rmmod.c
@@ -40,7 +40,6 @@ static const struct option cmdopts[] = {
 	{"syslog", no_argument, 0, 's'},
 	{"verbose", no_argument, 0, 'v'},
 	{"version", no_argument, 0, 'V'},
-	{"wait", no_argument, 0, 'w'},
 	{"help", no_argument, 0, 'h'},
 	{NULL, 0, 0, 0}
 };