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 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 01F26C433FE for ; Sat, 19 Nov 2022 17:20:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=iyvWA3DyuWkT3IFyqC2bIcX+/ZYiiZtbJr/UQSHlTjo=; b=BjgkYXa9bdt58R yMH58iG7IsUOSSXXZCGnwgawO59uYQAHSoxlw8Q/67wwZWR6So7O44B+5cTZQzLr5fH3mKknua4ff JrN+75BuKZ4omSb5SGKUa0p3rnRWh7qTM2zls8mRfnYkfh378+rRwvCytnBvXGY2vYylgPbqWYXtk GfcshTeJMOUVzGQzfTVL7gfvWT0jQ0FXYAmcDrZ64gdVRygXlWqU39f6r+gcsu0WM6OIkFTxcXIQH SL5fRG0FiB0vvZ7uzl72GWIpseny8FvqGL7tQYyqtU7oK5tVe1QMMPDQifkAH8pl82oBSDBzIrR/f eu6C2P2id0OFX/c8z4nQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1owRUt-00FWDq-0b; Sat, 19 Nov 2022 17:19:19 +0000 Received: from perceval.ideasonboard.com ([213.167.242.64]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1owRUo-00FWBb-PD; Sat, 19 Nov 2022 17:19:16 +0000 Received: from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi [62.78.145.57]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 8CFC5749; Sat, 19 Nov 2022 18:19:12 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1668878352; bh=VrJTKizOe2YunSUmQn/OwL6ElVv/m3nvCVjBO+OezFI=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=v2XqIaTDLORxdfkirAQmgwNu3eFhcy073+DUCHQCbo6hPH64HpNewH4QuhDOEzDcS kkLEehQF6NYqwWmf3wowryQ1sW/mUMXCPmOakwieLXzn7xzxyIz7HlsuKR3WcxVsG/ 5bgczrpafW8shlOMOLxa5AK/nVNHoMUl3GiH6R/Y= Date: Sat, 19 Nov 2022 19:18:56 +0200 From: Laurent Pinchart To: Dafna Hirschfeld Cc: Paul Elder , linux-media@vger.kernel.org, Mauro Carvalho Chehab , Rob Herring , Krzysztof Kozlowski , Heiko Stuebner , Helen Koike , linux-rockchip@lists.infradead.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Kieran Bingham Subject: Re: [PATCH v3 03/14] media: rkisp1: Add and use rkisp1_has_feature() macro Message-ID: References: <20221118093931.1284465-1-paul.elder@ideasonboard.com> <20221118093931.1284465-4-paul.elder@ideasonboard.com> <20221119110322.4drj7qqtp46vjcnn@guri> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20221119110322.4drj7qqtp46vjcnn@guri> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221119_091915_010566_657D99DE X-CRM114-Status: GOOD ( 23.02 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi Dafna, On Sat, Nov 19, 2022 at 01:03:22PM +0200, Dafna Hirschfeld wrote: > On 18.11.2022 18:39, Paul Elder wrote: > > From: Laurent Pinchart > > > > Simplify feature tests with a macro that shortens lines. > > > > Signed-off-by: Laurent Pinchart > > Reviewed-by: Paul Elder > > Reviewed-by: Kieran Bingham > > --- > > .../media/platform/rockchip/rkisp1/rkisp1-common.h | 3 +++ > > .../media/platform/rockchip/rkisp1/rkisp1-dev.c | 14 +++++++------- > > 2 files changed, 10 insertions(+), 7 deletions(-) > > > > diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h b/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h > > index a1293c45aae1..fc33c185b99f 100644 > > --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h > > +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h > > @@ -111,6 +111,9 @@ enum rkisp1_feature { > > RKISP1_FEATURE_MIPI_CSI2 = BIT(0), > > }; > > > > +#define rkisp1_has_feature(rkisp1, feature) \ > > + ((rkisp1)->info->features & RKISP1_FEATURE_##feature) > > maybe instead of that string concatination you can remove the > 'RKISP1_FEATURE' prefix from the enum We could, but I'm worried this would create short names subject to namespace clashes (such as "MIPI_CSI2" for instance). > > + > > /* > > * struct rkisp1_info - Model-specific ISP Information > > * > > diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c > > index f2475c6235ea..e348d8c86861 100644 > > --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c > > +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c > > @@ -206,7 +206,7 @@ static int rkisp1_subdev_notifier_register(struct rkisp1_device *rkisp1) > > switch (reg) { > > case 0: > > /* MIPI CSI-2 port */ > > - if (!(rkisp1->info->features & RKISP1_FEATURE_MIPI_CSI2)) { > > + if (!rkisp1_has_feature(rkisp1, MIPI_CSI2)) { > > dev_err(rkisp1->dev, > > "internal CSI must be available for port 0\n"); > > ret = -EINVAL; > > @@ -338,7 +338,7 @@ static int rkisp1_create_links(struct rkisp1_device *rkisp1) > > unsigned int i; > > int ret; > > > > - if (rkisp1->info->features & RKISP1_FEATURE_MIPI_CSI2) { > > + if (rkisp1_has_feature(rkisp1, MIPI_CSI2)) { > > /* Link the CSI receiver to the ISP. */ > > ret = media_create_pad_link(&rkisp1->csi.sd.entity, > > RKISP1_CSI_PAD_SRC, > > @@ -390,7 +390,7 @@ static int rkisp1_create_links(struct rkisp1_device *rkisp1) > > > > static void rkisp1_entities_unregister(struct rkisp1_device *rkisp1) > > { > > - if (rkisp1->info->features & RKISP1_FEATURE_MIPI_CSI2) > > + if (rkisp1_has_feature(rkisp1, MIPI_CSI2)) > > rkisp1_csi_unregister(rkisp1); > > rkisp1_params_unregister(rkisp1); > > rkisp1_stats_unregister(rkisp1); > > @@ -423,7 +423,7 @@ static int rkisp1_entities_register(struct rkisp1_device *rkisp1) > > if (ret) > > goto error; > > > > - if (rkisp1->info->features & RKISP1_FEATURE_MIPI_CSI2) { > > + if (rkisp1_has_feature(rkisp1, MIPI_CSI2)) { > > ret = rkisp1_csi_register(rkisp1); > > if (ret) > > goto error; > > @@ -590,7 +590,7 @@ static int rkisp1_probe(struct platform_device *pdev) > > goto err_unreg_v4l2_dev; > > } > > > > - if (rkisp1->info->features & RKISP1_FEATURE_MIPI_CSI2) { > > + if (rkisp1_has_feature(rkisp1, MIPI_CSI2)) { > > ret = rkisp1_csi_init(rkisp1); > > if (ret) > > goto err_unreg_media_dev; > > @@ -611,7 +611,7 @@ static int rkisp1_probe(struct platform_device *pdev) > > err_unreg_entities: > > rkisp1_entities_unregister(rkisp1); > > err_cleanup_csi: > > - if (rkisp1->info->features & RKISP1_FEATURE_MIPI_CSI2) > > + if (rkisp1_has_feature(rkisp1, MIPI_CSI2)) > > rkisp1_csi_cleanup(rkisp1); > > err_unreg_media_dev: > > media_device_unregister(&rkisp1->media_dev); > > @@ -630,7 +630,7 @@ static int rkisp1_remove(struct platform_device *pdev) > > v4l2_async_nf_cleanup(&rkisp1->notifier); > > > > rkisp1_entities_unregister(rkisp1); > > - if (rkisp1->info->features & RKISP1_FEATURE_MIPI_CSI2) > > + if (rkisp1_has_feature(rkisp1, MIPI_CSI2)) > > rkisp1_csi_cleanup(rkisp1); > > rkisp1_debug_cleanup(rkisp1); > > -- Regards, Laurent Pinchart _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel