Received: by 2002:a05:6a10:6d10:0:0:0:0 with SMTP id gq16csp812549pxb; Tue, 12 Apr 2022 14:08:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwFPQVfixV9YZ/VR/2Fp24oIQ7PHgUoLppzQhLV/r+NOOk4pX0ffiZPxp/OkXcATkVUyQtD X-Received: by 2002:a63:c144:0:b0:399:3e75:1d55 with SMTP id p4-20020a63c144000000b003993e751d55mr32093239pgi.199.1649797715711; Tue, 12 Apr 2022 14:08:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649797715; cv=none; d=google.com; s=arc-20160816; b=oQ5sOfVnzE3m6fzSFvQPWEzYzt8EYhuJnxVviOeal+En+xWSqAMLUbbMxyIbuLHugY V4opBs853yFiM1x6dTR1UqDVnOpMOyoHVvQGLD+rgnC5XMyDDJZMIUALMPwBZndO0xk9 nHujqbdilHNoM3ZNSdH9fEyoVHI8uoMnSTTUzlKMLrrmC9ezCsZQ8oKQW9YacHKNip5i 85CKvZIVnbIwg+hgDbnXMmXNcGrnszVUwRrYEQgGHQ67R1I1gKNq/Hw6njQImmSUpoMZ Eez3ShNTL3bKxk6yhcz+UMbPDqoW1XbuuDy+JNAPXkZBn65CoxCWeJS4SEo2NlMWHkkZ Y9MQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:user-agent:message-id:date:to:cc:from:subject :references:in-reply-to:content-transfer-encoding:mime-version :dkim-signature; bh=flKNbbUNYB35yHEQrEHIwKklDQtEUZDgZD263hW4J7Y=; b=ERMY5cq1eFT7JMW/DBnUYIPSdT0Qcn0LFkcm0R8CYhXgQoO47IXvxyPLW9No0MhHGX BOROgtQqGtdogyqeGm2PX5Iw8cHSIy5NBhPpJ59kwvC2+lH/KIzD8seWhPhNJVuOdUVi 1u97znNMQrIFLOUOhnuT10JDXm1gjcFSd1sstC6QZ98kVAeVwhzpprtJw6C5GUJ8Vilz Emdh5z5Secua7ohNWuyOlxOhSaRuvWsDzKJxB6OnBMlbgtcfqVi3urMKIx9ZHQ5i4oJb CBSDE624EB3N9EZo9lC6mOxbJN2jpENlUHoWHr//8bPJ38L7r7G2qqJT41OraV7OlQj8 3EVA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass (test mode) header.i=@ideasonboard.com header.s=mail header.b=NRmKL9A7; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [2620:137:e000::1:18]) by mx.google.com with ESMTPS id m10-20020a170902db0a00b00153b7e108bbsi7732440plx.489.2022.04.12.14.08.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Apr 2022 14:08:35 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18; Authentication-Results: mx.google.com; dkim=pass (test mode) header.i=@ideasonboard.com header.s=mail header.b=NRmKL9A7; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 1A9E2DE93A; Tue, 12 Apr 2022 13:25:39 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229616AbiDIT15 (ORCPT + 99 others); Sat, 9 Apr 2022 15:27:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42642 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229560AbiDIT1y (ORCPT ); Sat, 9 Apr 2022 15:27:54 -0400 Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9BBA0CE6; Sat, 9 Apr 2022 12:25:45 -0700 (PDT) Received: from pendragon.ideasonboard.com (cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net [86.31.172.11]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 97C83482; Sat, 9 Apr 2022 21:25:42 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1649532342; bh=NGodcPcuMgVqLfK/lv7UN9kdDu88L3Dqzl9+IQ2YupM=; h=In-Reply-To:References:Subject:From:Cc:To:Date:From; b=NRmKL9A7lhYf+PoplZGSUjnG0X16HiM7lQVyqjrBWsezx6Y6oyGDkh3KmDw5+M2La pCYVJhBhNx9XeZz7wbBYzsvHqNiWgek1IZIj21F/TTVLsLAeLW42AdHWVud5fm2ugG 8oEP+LUeldopF4qALrsI66E1DZZdDTRyuGUDNy6g= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable In-Reply-To: <21f190a8bb9ddaa43949b4455983bd66b4e11798.1649440397.git.ian.dev@arkver.com> References: <21f190a8bb9ddaa43949b4455983bd66b4e11798.1649440397.git.ian.dev@arkver.com> Subject: Re: [PATCH] media: media-entity.h: Fix documentation for media_create_intf_link From: Kieran Bingham Cc: Ian Arkver , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org To: Ian Jamison , Laurent Pinchart , Mauro Carvalho Chehab , Sakari Ailus Date: Sat, 09 Apr 2022 20:25:40 +0100 Message-ID: <164953234079.22830.17385702287665697579@Monstersaurus> User-Agent: alot/0.10 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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. >=20 > Signed-off-by: Ian Jamison > Fixes: db7ee32aa185 ("[media] media-device.h: Improve documentation and u= pdate it") > --- > include/media/media-entity.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) >=20 > 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_devi= ce *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 > =20 > /** > * media_create_intf_link() - creates a link between an entity and an in= terface > @@ -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); > --=20 > 2.35.1 >