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 1A025C43334 for ; Thu, 7 Jul 2022 13:38:57 +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=QNHBNn7S8JwDPIj6wnj7J5LpEaKz/mTIUL753kh1Fww=; b=p6cIYTyuOssSvN xN+50jKcZlZVN0OHDyx810QhAfB+CkUSDV+OIT8SfeCranQNEp13iV6DXqnzKrQdCPRJYbXHPcSQe 6d9xTT46zQ9Fu53cPvZHY4RqF3IySNATwGJUzVzD4EdOzrZseGEr1LGGfWMbcnoMj5RAL0PfbRg2j xGmxgbbWOcXoVkHDS+yib+Sg3aXshamoKbcblyVF8XXz04owTWz+LLruV9LKYs4VbjemFh0Em6FJ5 pB2f5P3cIyfagsNftNTzFOEkr/h124bpfqTE1vobVFH75aHbQiHteEGs8tpjmoN5TfuElocJmTeGf ZxRepMHTk8y37qkhKbDQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1o9RiU-00GIPH-Sb; Thu, 07 Jul 2022 13:38:50 +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 1o9RiR-00GINz-RT for linux-rockchip@lists.infradead.org; Thu, 07 Jul 2022 13:38:49 +0000 Received: from pyrite.rasen.tech (softbank036240121080.bbtec.net [36.240.121.80]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id C9155D00; Thu, 7 Jul 2022 15:38:43 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1657201126; bh=VVH9Oot9nfcBVO9xWGunCW3T6MtU1oXlbDcyMA0v3io=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=fWb+xDN/QU+QTGYtYrugDhdCLGgCyvwSIqfgTGeRMBMqC5iqS01C3ZVhm1JeQQGGV i4nEdvK14yWEDvMkUG50iM5ij78Lc5y8nVFK40vrM63Cwsq0VXvqzOy7U8QkpVGxN4 soHhj4Qhgh0C/WG9udwm8TBnRRyMNNfaqtWk8TPU= Date: Thu, 7 Jul 2022 22:38:37 +0900 From: paul.elder@ideasonboard.com To: Laurent Pinchart Cc: linux-media@vger.kernel.org, linux-rockchip@lists.infradead.org, Dafna Hirschfeld , Heiko Stuebner , Helen Koike Subject: Re: [PATCH v2 08/55] media: rkisp1: Rename rkisp1_match_data to rkisp1_info Message-ID: <20220707133837.GI3886060@pyrite.rasen.tech> References: <20220630230713.10580-1-laurent.pinchart@ideasonboard.com> <20220630230713.10580-9-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20220630230713.10580-9-laurent.pinchart@ideasonboard.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220707_063848_084057_8EDD2F54 X-CRM114-Status: GOOD ( 20.12 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org Hi Laurent, On Fri, Jul 01, 2022 at 02:06:26AM +0300, Laurent Pinchart wrote: > The rkisp1_match_data structure contains device model-specific > information. It it referenced from OF match data, but that's an > implementation detail. Rename it to rkisp1_info to reflect its main > purpose. > > Signed-off-by: Laurent Pinchart > Reviewed-by: Dafna Hirschfeld Reviewed-by: Paul Elder > --- > .../platform/rockchip/rkisp1/rkisp1-dev.c | 34 +++++++++---------- > 1 file changed, 17 insertions(+), 17 deletions(-) > > diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c > index ba773c0784fb..258980ef4783 100644 > --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c > +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c > @@ -105,7 +105,7 @@ struct rkisp1_isr_data { > irqreturn_t (*isr)(int irq, void *ctx); > }; > > -struct rkisp1_match_data { > +struct rkisp1_info { > const char * const *clks; > unsigned int clk_size; > const struct rkisp1_isr_data *isrs; > @@ -420,7 +420,7 @@ static const struct rkisp1_isr_data px30_isp_isrs[] = { > { "mipi", rkisp1_mipi_isr }, > }; > > -static const struct rkisp1_match_data px30_isp_match_data = { > +static const struct rkisp1_info px30_isp_info = { > .clks = px30_isp_clks, > .clk_size = ARRAY_SIZE(px30_isp_clks), > .isrs = px30_isp_isrs, > @@ -438,7 +438,7 @@ static const struct rkisp1_isr_data rk3399_isp_isrs[] = { > { NULL, rkisp1_isr }, > }; > > -static const struct rkisp1_match_data rk3399_isp_match_data = { > +static const struct rkisp1_info rk3399_isp_info = { > .clks = rk3399_isp_clks, > .clk_size = ARRAY_SIZE(rk3399_isp_clks), > .isrs = rk3399_isp_isrs, > @@ -449,11 +449,11 @@ static const struct rkisp1_match_data rk3399_isp_match_data = { > static const struct of_device_id rkisp1_of_match[] = { > { > .compatible = "rockchip,px30-cif-isp", > - .data = &px30_isp_match_data, > + .data = &px30_isp_info, > }, > { > .compatible = "rockchip,rk3399-cif-isp", > - .data = &rk3399_isp_match_data, > + .data = &rk3399_isp_info, > }, > {}, > }; > @@ -461,7 +461,7 @@ MODULE_DEVICE_TABLE(of, rkisp1_of_match); > > static int rkisp1_probe(struct platform_device *pdev) > { > - const struct rkisp1_match_data *match_data; > + const struct rkisp1_info *info; > struct device *dev = &pdev->dev; > struct rkisp1_device *rkisp1; > struct v4l2_device *v4l2_dev; > @@ -469,8 +469,8 @@ static int rkisp1_probe(struct platform_device *pdev) > int ret, irq; > u32 cif_id; > > - match_data = of_device_get_match_data(&pdev->dev); > - if (!match_data) > + info = of_device_get_match_data(&pdev->dev); > + if (!info) > return -ENODEV; > > rkisp1 = devm_kzalloc(dev, sizeof(*rkisp1), GFP_KERNEL); > @@ -486,14 +486,14 @@ static int rkisp1_probe(struct platform_device *pdev) > if (IS_ERR(rkisp1->base_addr)) > return PTR_ERR(rkisp1->base_addr); > > - for (i = 0; i < match_data->isr_size; i++) { > - irq = match_data->isrs[i].name > - ? platform_get_irq_byname(pdev, match_data->isrs[i].name) > + for (i = 0; i < info->isr_size; i++) { > + irq = info->isrs[i].name > + ? platform_get_irq_byname(pdev, info->isrs[i].name) > : platform_get_irq(pdev, i); > if (irq < 0) > return irq; > > - ret = devm_request_irq(dev, irq, match_data->isrs[i].isr, IRQF_SHARED, > + ret = devm_request_irq(dev, irq, info->isrs[i].isr, IRQF_SHARED, > dev_driver_string(dev), dev); > if (ret) { > dev_err(dev, "request irq failed: %d\n", ret); > @@ -501,12 +501,12 @@ static int rkisp1_probe(struct platform_device *pdev) > } > } > > - for (i = 0; i < match_data->clk_size; i++) > - rkisp1->clks[i].id = match_data->clks[i]; > - ret = devm_clk_bulk_get(dev, match_data->clk_size, rkisp1->clks); > + for (i = 0; i < info->clk_size; i++) > + rkisp1->clks[i].id = info->clks[i]; > + ret = devm_clk_bulk_get(dev, info->clk_size, rkisp1->clks); > if (ret) > return ret; > - rkisp1->clk_size = match_data->clk_size; > + rkisp1->clk_size = info->clk_size; > > pm_runtime_enable(&pdev->dev); > > @@ -519,7 +519,7 @@ static int rkisp1_probe(struct platform_device *pdev) > > pm_runtime_put(&pdev->dev); > > - rkisp1->media_dev.hw_revision = match_data->isp_ver; > + rkisp1->media_dev.hw_revision = info->isp_ver; > strscpy(rkisp1->media_dev.model, RKISP1_DRIVER_NAME, > sizeof(rkisp1->media_dev.model)); > rkisp1->media_dev.dev = &pdev->dev; _______________________________________________ Linux-rockchip mailing list Linux-rockchip@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-rockchip