From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D4290C282DA for ; Fri, 5 Apr 2019 21:44:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 999EA20663 for ; Fri, 5 Apr 2019 21:44:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726547AbfDEVo5 (ORCPT ); Fri, 5 Apr 2019 17:44:57 -0400 Received: from mga11.intel.com ([192.55.52.93]:51871 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726204AbfDEVoz (ORCPT ); Fri, 5 Apr 2019 17:44:55 -0400 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 05 Apr 2019 14:44:54 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,313,1549958400"; d="scan'208";a="140486247" Received: from sjchrist-coffee.jf.intel.com ([10.54.74.181]) by fmsmga007.fm.intel.com with ESMTP; 05 Apr 2019 14:44:54 -0700 From: Sean Christopherson To: Jonathan Corbet Cc: linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/4] kernel-doc: Revert "scripts/kernel-doc: Processing -nofunc for functions only" Date: Fri, 5 Apr 2019 14:44:50 -0700 Message-Id: <20190405214453.18768-2-sean.j.christopherson@intel.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190405214453.18768-1-sean.j.christopherson@intel.com> References: <20190405214453.18768-1-sean.j.christopherson@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Now that Docbook has been deprecated in favor of Sphinx, the -nofunction option in kernel-doc is defunct, e.g. Sphinx doesn't currently support it. Furthermore, "functions only" behavior was used by Docproc to avoid duplicating exported symbols, which is now handled by -export and -internal. The end goal is to enable using :nofunction: in .rst files to split documentation of structures into separate categories. This reverts commit 23aebb3c05f3b3fb06a68bf6b1539a05a5f8aaab. Signed-off-by: Sean Christopherson --- scripts/kernel-doc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/scripts/kernel-doc b/scripts/kernel-doc index 3350e498b4ce..1b40b10794da 100755 --- a/scripts/kernel-doc +++ b/scripts/kernel-doc @@ -1026,9 +1026,10 @@ sub output_declaration { (($output_selection == OUTPUT_INCLUDE || $output_selection == OUTPUT_EXPORTED) && defined($function_table{$name})) || - (($output_selection == OUTPUT_EXCLUDE || - $output_selection == OUTPUT_INTERNAL) && - !($functype eq "function" && defined($function_table{$name})))) + ($output_selection == OUTPUT_INTERNAL && + !($functype eq "function" && defined($function_table{$name}))) || + ($output_selection == OUTPUT_EXCLUDE && + !defined($function_table{$name}))) { &$func(@_); $section_counter++; -- 2.21.0