Received-SPF: pass (google.com: domain of linux-kernel+bounces-33098-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
From: Anna-Maria Behnsen <anna-maria@linutronix.de>
To: linux-doc@vger.kernel.org
Cc: Jonathan Corbet <corbet@lwn.net>,
	Thomas Gleixner <tglx@linutronix.de>,
	Ingo Molnar <mingo@redhat.com>,
	Borislav Petkov <bp@alien8.de>,
	x86@kernel.org,
	Mike Rapoport <rppt@kernel.org>,
	Herbert Xu <herbert@gondor.apana.org.au>,
	"David S. Miller" <davem@davemloft.net>,
	Marco Elver <elver@google.com>,
	Alexander Potapenko <glider@google.com>,
	Shuah Khan <shuah@kernel.org>,
	Johannes Berg <johannes@sipsolutions.net>,
	Moritz Fischer <mdf@kernel.org>,
	Wu Hao <hao.wu@intel.com>,
	Xu Yilun <yilun.xu@intel.com>,
	Dipen Patel <dipenp@nvidia.com>,
	Philipp Zabel <p.zabel@pengutronix.de>,
	Heikki Krogerus <heikki.krogerus@linux.intel.com>,
	David Airlie <airlied@gmail.com>,
	Daniel Vetter <daniel@ffwll.ch>,
	Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
	Maxime Ripard <mripard@kernel.org>,
	Thomas Zimmermann <tzimmermann@suse.de>,
	Jiri Kosina <jikos@kernel.org>,
	Benjamin Tissoires <benjamin.tissoires@redhat.com>,
	linux-kernel@vger.kernel.org,
	Anna-Maria Behnsen <anna-maria@linutronix.de>
Subject: [PATCH 2/2] Documentation: Remove deprecated kernel-doc option 'functions'
Date: Mon, 22 Jan 2024 14:28:20 +0100
Message-Id: <20240122132820.46633-3-anna-maria@linutronix.de>
In-Reply-To: <20240122132820.46633-1-anna-maria@linutronix.de>
References: <20240122132820.46633-1-anna-maria@linutronix.de>
Precedence: bulk
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit

As there are no more users of deprecated kernel-doc option 'functions', remove
the related parts in documentation and scripts.

Signed-off-by: Anna-Maria Behnsen <anna-maria@linutronix.de>
---
 Documentation/doc-guide/kernel-doc.rst | 3 ---
 Documentation/sphinx/kerneldoc.py      | 5 -----
 2 files changed, 8 deletions(-)

diff --git a/Documentation/doc-guide/kernel-doc.rst b/Documentation/doc-guide/kernel-doc.rst
index 6ad72ac6861b..74d6408abcd3 100644
--- a/Documentation/doc-guide/kernel-doc.rst
+++ b/Documentation/doc-guide/kernel-doc.rst
@@ -505,9 +505,6 @@ no-identifiers: *[ function/type ...]*
     .. kernel-doc:: lib/bitmap.c
        :no-identifiers: bitmap_parselist
 
-functions: *[ function/type ...]*
-  This is an alias of the 'identifiers' directive and deprecated.
-
 doc: *title*
   Include documentation for the ``DOC:`` paragraph identified by *title* in
   *source*. Spaces are allowed in *title*; do not quote the *title*. The *title*
diff --git a/Documentation/sphinx/kerneldoc.py b/Documentation/sphinx/kerneldoc.py
index 7acf09963daa..2d57c464c76a 100644
--- a/Documentation/sphinx/kerneldoc.py
+++ b/Documentation/sphinx/kerneldoc.py
@@ -53,7 +53,6 @@ class KernelDocDirective(Directive):
         'internal': directives.unchanged,
         'identifiers': directives.unchanged,
         'no-identifiers': directives.unchanged,
-        'functions': directives.unchanged,
     }
     has_content = False
 
@@ -74,10 +73,6 @@ class KernelDocDirective(Directive):
 
         tab_width = self.options.get('tab-width', self.state.document.settings.tab_width)
 
-        # 'function' is an alias of 'identifiers'
-        if 'functions' in self.options:
-            self.options['identifiers'] = self.options.get('functions')
-
         # FIXME: make this nicer and more robust against errors
         if 'export' in self.options:
             cmd += ['-export']
-- 
2.39.2