public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
To: Kieran Bingham <kieran.bingham@ideasonboard.com>
Cc: Ian Jamison <ian.dev@arkver.com>,
	Mauro Carvalho Chehab <mchehab@kernel.org>,
	Sakari Ailus <sakari.ailus@linux.intel.com>,
	Ian Arkver <ian.arkver.dev@gmail.com>,
	linux-media@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] media: media-entity.h: Fix documentation for media_create_intf_link
Date: Sun, 10 Apr 2022 18:10:45 +0300	[thread overview]
Message-ID: <YlLzdbHTaQu01HKJ@pendragon.ideasonboard.com> (raw)
In-Reply-To: <164953234079.22830.17385702287665697579@Monstersaurus>

On Sat, Apr 09, 2022 at 08:25:40PM +0100, Kieran Bingham wrote:
> Quoting Ian Jamison (2022-04-08 18:53:45)
> > The documentation comment was inserted between the return type
> > and the function name. Reunite the lines.
> > 
> > Signed-off-by: Ian Jamison <ian.dev@arkver.com>
> > Fixes: db7ee32aa185 ("[media] media-device.h: Improve documentation and update it")
> > ---
> >  include/media/media-entity.h | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/include/media/media-entity.h b/include/media/media-entity.h
> > index 742918962d46..9bc9a55df71e 100644
> > --- a/include/media/media-entity.h
> > +++ b/include/media/media-entity.h
> > @@ -1030,7 +1030,6 @@ __must_check media_devnode_create(struct media_device *mdev,
> >   * removed.
> >   */
> >  void media_devnode_remove(struct media_intf_devnode *devnode);
> > -struct media_link *
> 
> Eeep. I guess that was some sort of merge conflict resolution that
> didn't quite get it right sometime.
> 
> But definitely a good fix.
> 
> Reviewed-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>

Indeed.

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

> >  /**
> >   * media_create_intf_link() - creates a link between an entity and an interface
> > @@ -1061,6 +1060,7 @@ struct media_link *
> >   *    the interface and media_device_register_entity() should be called for the
> >   *    interface that will be part of the link.
> >   */
> > +struct media_link *
> >  __must_check media_create_intf_link(struct media_entity *entity,
> >                                     struct media_interface *intf,
> >                                     u32 flags);

-- 
Regards,

Laurent Pinchart

      reply	other threads:[~2022-04-10 15:10 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-04-08 17:53 [PATCH] media: media-entity.h: Fix documentation for media_create_intf_link Ian Jamison
2022-04-09 19:25 ` Kieran Bingham
2022-04-10 15:10   ` Laurent Pinchart [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=YlLzdbHTaQu01HKJ@pendragon.ideasonboard.com \
    --to=laurent.pinchart@ideasonboard.com \
    --cc=ian.arkver.dev@gmail.com \
    --cc=ian.dev@arkver.com \
    --cc=kieran.bingham@ideasonboard.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-media@vger.kernel.org \
    --cc=mchehab@kernel.org \
    --cc=sakari.ailus@linux.intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox