Received: by 2002:a5b:505:0:0:0:0:0 with SMTP id o5csp2460457ybp; Sat, 5 Oct 2019 12:39:06 -0700 (PDT) X-Google-Smtp-Source: APXvYqzQbZqRY2Qr4K/8nwS2o8JhptWBtd55OQj06y5cwBBKckbH0ym5SwREFzmqSokCxAlmv2zq X-Received: by 2002:a50:a8a2:: with SMTP id k31mr21454302edc.79.1570304346397; Sat, 05 Oct 2019 12:39:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1570304346; cv=none; d=google.com; s=arc-20160816; b=chsKRoc5Oq23vCkxDGkM2M/PmGuLWaCOTRX4dvfTWhcKvckzDkuaEs9K3ruyRKojmt muDh+5PI5dezsyWgiADez054l2JOrcUPe4FGbsJBt4oR524L6sNA+VGomTv3goH8lv5Y l8eQO3bHQSqDE7lQ2SR0QyuiCJs779nECcI23b07rovL7bgPSCUEuteUzQHV1fs/X86t z0nGjzonrCrAxkmRSAOWxcneB0yOWkFjFyy0JNernZsH9UNn9bF2VyclUtMTwydckG9T zgdvchRYxSmwP66lTrto1x4ZN9eWuIvH1bzlPNz7ocWVDexeP9/AIlZOYlPgDTk228OE +4Aw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:user-agent:in-reply-to :content-transfer-encoding:content-disposition:mime-version :references:reply-to:message-id:subject:cc:to:from:date :dkim-signature; bh=MtDqsRtY2JobI/UTZ2NyVAngO8S8qmcs+dEOHqGZSxg=; b=dqRlnyr5KKmKpr5VfoLmNo4mDUzb7LohNvbknNhjBlfvLdvURncaXi8z44lrJZ8EKR /AuRL4GJQcxdH3wiCQ9FdBCUcq3Tl/XPpyushBCSHJ5EnPyhVJfHdc69eGa7U/TjfS2D 8BSlxC5ztP1yX4E3xV3PedYgUbGNRcSbohnt6UPj8/6yJvWDGj2klNIyK8VkEJ5AMhoE YKini8+szbE6XvvgQfBLgQbUerYwPV86i28ybSzSSqVSy3zl53d3MYJ5zoVwMANA0+UO X3NKsxbn/IK1BP1+yjCUc4TcejM2DXWYtNFxvEXrvl4o6PDmZVXYOqI9S9Nm1pk0pGGU Vgfw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=czj5hSPT; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f13si3854360ejj.402.2019.10.05.12.38.43; Sat, 05 Oct 2019 12:39:06 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=czj5hSPT; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729794AbfJETff (ORCPT + 99 others); Sat, 5 Oct 2019 15:35:35 -0400 Received: from mail.kernel.org ([198.145.29.99]:50072 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727466AbfJETff (ORCPT ); Sat, 5 Oct 2019 15:35:35 -0400 Received: from paulmck-ThinkPad-P72 (50-39-105-78.bvtn.or.frontiernet.net [50.39.105.78]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 68B48222BE; Sat, 5 Oct 2019 19:35:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1570304134; bh=N2IGytc2o4ufvvnPDZG2PtjqoSMvf+gv69vkoEiVA88=; h=Date:From:To:Cc:Subject:Reply-To:References:In-Reply-To:From; b=czj5hSPTOGjg+uzNMcwu5L2tOZvDxeNia0zNVpAuDgsXGXstWhXaPSHBuejTPGVeG 9aWMov28pcCxLa5YUzAENj2e2f4EFB4V7HHeLDhXbJxuvJXgsT5wEXZx5nqi4VuE++ 1wdsN9yMuuQruMJrvpRVXAk0Wu/pFlkcb8wcgEGI= Date: Sat, 5 Oct 2019 12:35:33 -0700 From: "Paul E. McKenney" To: Jonathan =?iso-8859-1?Q?Neusch=E4fer?= Cc: rcu@vger.kernel.org, Josh Triplett , Steven Rostedt , Mathieu Desnoyers , Lai Jiangshan , Joel Fernandes , linux-kernel@vger.kernel.org Subject: Re: [PATCH] rculist: Describe variadic macro argument in a Sphinx-compatible way Message-ID: <20191005193533.GO2689@paulmck-ThinkPad-P72> Reply-To: paulmck@kernel.org References: <20191004215402.28008-1-j.neuschaefer@gmx.net> <20191004222439.GR2689@paulmck-ThinkPad-P72> <20191004232328.GC19803@latitude> <20191005133330.GX2689@paulmck-ThinkPad-P72> <20191005193123.GD19803@latitude> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20191005193123.GD19803@latitude> User-Agent: Mutt/1.9.4 (2018-02-28) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sat, Oct 05, 2019 at 09:31:23PM +0200, Jonathan Neusch?fer wrote: > On Sat, Oct 05, 2019 at 06:33:30AM -0700, Paul E. McKenney wrote: > > On Sat, Oct 05, 2019 at 01:23:28AM +0200, Jonathan Neusch?fer wrote: > > > On Fri, Oct 04, 2019 at 03:24:39PM -0700, Paul E. McKenney wrote: > > > > On Fri, Oct 04, 2019 at 11:54:02PM +0200, Jonathan Neusch?fer wrote: > > > > > Without this patch, Sphinx shows "variable arguments" as the description > > > > > of the cond argument, rather than the intended description, and prints > > > > > the following warnings: > > > > > > > > > > ./include/linux/rculist.h:374: warning: Excess function parameter 'cond' description in 'list_for_each_entry_rcu' > > > > > ./include/linux/rculist.h:651: warning: Excess function parameter 'cond' description in 'hlist_for_each_entry_rcu' > > > > > > Hmm, small detail that I didn't realize before: It's actually the > > > kernel-doc script, not Sphinx, that can't deal with variadic macro > > > arguments and thus requires this patch. > > > > > > So it may also be possible to fix the script instead. (I have not > > > looked into how much work that would be.) > > > > OK, thank you for letting me know. I will keep your patch for the > > moment, but please let me know if the fix can be elsewhere. > > > > Thanx, Paul > > Turns out the actual fix in scripts/kernel-doc is easy enough: > > --- a/scripts/kernel-doc > +++ b/scripts/kernel-doc > @@ -1449,6 +1449,10 @@ sub push_parameter($$$$) { > # handles unnamed variable parameters > $param = "..."; > } > + elsif ($param =~ /\w\.\.\.$/) { > + # for named variable parameters of the form `x...`, remove the dots > + $param =~ s/\.\.\.$//; > + } > if (!defined $parameterdescs{$param} || $parameterdescs{$param} eq "") { > $parameterdescs{$param} = "variable arguments"; > } > > ... but there are other macros in the code base that are documented > using the 'x...' syntax, so I guess it's best to take my initial patch > (or something similar) now, and I'll fix kernel-doc later, in a longer > patchset that also cleans up the fallout. You got it! ;-) Thanx, Paul