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=-8.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,UNPARSEABLE_RELAY autolearn=unavailable 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 94C05C433E0 for ; Mon, 8 Feb 2021 18:52:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4EBF164E5A for ; Mon, 8 Feb 2021 18:52:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235026AbhBHSwX (ORCPT ); Mon, 8 Feb 2021 13:52:23 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46670 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233586AbhBHQ6o (ORCPT ); Mon, 8 Feb 2021 11:58:44 -0500 Received: from bhuna.collabora.co.uk (bhuna.collabora.co.uk [IPv6:2a00:1098:0:82:1000:25:2eeb:e3e3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9CB77C061786; Mon, 8 Feb 2021 08:58:04 -0800 (PST) Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: ezequiel) with ESMTPSA id E79481F412A7 Message-ID: <4af499f5931d6b04a42787ae17525c63247573e6.camel@collabora.com> Subject: Re: linux-next: build warning after merge of the v4l-dvb tree From: Ezequiel Garcia To: Sakari Ailus Cc: Stephen Rothwell , Mauro Carvalho Chehab , Linux Kernel Mailing List , Linux Next Mailing List Date: Mon, 08 Feb 2021 13:57:56 -0300 In-Reply-To: <20210208164618.GY32460@paasikivi.fi.intel.com> References: <20210208233716.16d962ad@canb.auug.org.au> <56cd99bbf526b43507579b5775bac5f885319866.camel@collabora.com> <20210208164618.GY32460@paasikivi.fi.intel.com> Organization: Collabora Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.38.2-1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 2021-02-08 at 18:46 +0200, Sakari Ailus wrote: > Hi Ezequiel, > > Thanks for addressing this. > > On Mon, Feb 08, 2021 at 01:42:21PM -0300, Ezequiel Garcia wrote: > > Hi Stephen, > > > > On Mon, 2021-02-08 at 23:37 +1100, Stephen Rothwell wrote: > > > Hi all, > > > > > > After merging the v4l-dvb tree, today's linux-next build (htmldocs) > > > produced this warning: > > > > > > include/media/v4l2-async.h:178: warning: expecting prototype for v4l2_async_notifier_add_fwnode_subdev(). Prototype was for > > > __v4l2_async_notifier_add_fwnode_subdev() instead > > > include/media/v4l2-async.h:207: warning: expecting prototype for v4l2_async_notifier_add_fwnode_remote_subdev(). Prototype was for > > > __v4l2_async_notifier_add_fwnode_remote_subdev() instead > > > include/media/v4l2-async.h:230: warning: expecting prototype for v4l2_async_notifier_add_i2c_subdev(). Prototype was for > > > __v4l2_async_notifier_add_i2c_subdev() instead > > > > > > Maybe introduced by commit > > > > > >   c1cc23625062 ("media: v4l2-async: Discourage use of v4l2_async_notifier_add_subdev") > > > > > > > Thanks for spotting this. Should be fixed by: > > > > diff --git a/include/media/v4l2-async.h b/include/media/v4l2-async.h > > index 6f22daa6f067..3785445282fc 100644 > > --- a/include/media/v4l2-async.h > > +++ b/include/media/v4l2-async.h > > @@ -157,7 +157,7 @@ int __v4l2_async_notifier_add_subdev(struct v4l2_async_notifier *notifier, > >                                    struct v4l2_async_subdev *asd); > >   > >  /** > > - * v4l2_async_notifier_add_fwnode_subdev - Allocate and add a fwnode async > > + * __v4l2_async_notifier_add_fwnode_subdev - Allocate and add a fwnode async > > The problem with the approach is that this no longer documents the API that > drivers are intended to use, but the intermediate one. I guess fixing > this properly could require changes to kerneldoc so I have no objections to > the approach. > Right, but do we have any other solution here? > >   *                             subdev to the notifier's master asd_list. > >   * > >   * @notifier: pointer to &struct v4l2_async_notifier > > @@ -181,7 +181,7 @@ __v4l2_async_notifier_add_fwnode_subdev(struct v4l2_async_notifier *notifier, > >                                                    sizeof(__type))) > >   > >  /** > > - * v4l2_async_notifier_add_fwnode_remote_subdev - Allocate and add a fwnode > > + * __v4l2_async_notifier_add_fwnode_remote_subdev - Allocate and add a fwnode > >   *                                               remote async subdev to the > >   *                                               notifier's master asd_list. > >   * > > @@ -210,7 +210,7 @@ __v4l2_async_notifier_add_fwnode_remote_subdev(struct v4l2_async_notifier *notif > >                                                           sizeof(__type))) > >   > >  /** > > - * v4l2_async_notifier_add_i2c_subdev - Allocate and add an i2c async > > + * __v4l2_async_notifier_add_i2c_subdev - Allocate and add an i2c async > >   *                             subdev to the notifier's master asd_list. > >   * > >   * @notifier: pointer to &struct v4l2_async_notifier > > @@ -228,7 +228,7 @@ struct v4l2_async_subdev * > >  __v4l2_async_notifier_add_i2c_subdev(struct v4l2_async_notifier *notifier, > >                                      int adapter_id, unsigned short address, > >                                      unsigned int asd_struct_size); > > -#define v4l2_async_notifier_add_i2c_subdev(__notifier, __adap, __addr, __type) \ > > +#define v4l2_async_notifier_i2c(__notifier, __adap, __addr, __type)    \ > > I guess this change was not intentional? > Indeed :) Thanks, Ezequiel