From nobody Tue Feb 10 02:46:37 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id EADB6EC8743 for ; Thu, 7 Sep 2023 16:53:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244443AbjIGQxN (ORCPT ); Thu, 7 Sep 2023 12:53:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46418 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245230AbjIGQxI (ORCPT ); Thu, 7 Sep 2023 12:53:08 -0400 Received: from mail-lf1-x130.google.com (mail-lf1-x130.google.com [IPv6:2a00:1450:4864:20::130]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 660711FD2 for ; Thu, 7 Sep 2023 09:52:40 -0700 (PDT) Received: by mail-lf1-x130.google.com with SMTP id 2adb3069b0e04-50078eba7afso2040095e87.0 for ; Thu, 07 Sep 2023 09:52:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1694105503; x=1694710303; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=fV8KpdoQDRQ8tjtNRjv68+ye669LLw2wjvu1wdeDVe4=; b=XIYvG04PynqQhSt+labddIArzImXIi2aHp4zIgrbbJRdTZ8XZbKUUA6o7xVPrl/GVw Fy+Q472rRaZIjGK6X6vL/4lOLh4izrAHw5SHgeXDE2+OB8tx1WPGszH24qk0t05UaFDV tgS7xgY6h4zMHevZDu8SRFYERYvP3/Z6RfL2urd9yvZfe71p5RG9e0VDq+oqTUIBT6+f H45d0aQoJAlmqv7Z0J6wumyRjbGPLPXRRnRActPXWBE5V1BkixPkdwym50vLZi0oZ8wG VJc+u3o732YWaKplxhUUDjXqyTsklhBBOChImAugFAgNmpMnvBPRvmMQAnjZ8ffIwqXE Rh1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694105503; x=1694710303; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fV8KpdoQDRQ8tjtNRjv68+ye669LLw2wjvu1wdeDVe4=; b=JAi2EaG83SjNGOjpmBZrlsg49p1bjMJbgbBq5CNyxm2XFfqis5JzPbIQQWx9SmbgSN Sk5ipooFwm8kCyVkGJfiOZCHNMZo8CIaKeJy302r15Oq0iX0AezBPAqBIH9fPPnWXKsm PQy26ijzvLTfMRrAO1TaqnoytrGl574PZpNiP0aBaOQW5myY4QyhxETRyuIuuO9Qyu7l PfV9PYU0iQT5Rw7sZi38VQG2+EHHGaYYtV+0XBOEZiXGnk+0TWc3f9i+vqzPQRNDuKI5 cWge6a+/R2ESi2+Z2zNt+opNWcbduLlnWBbIG0t5H32Q/oXGJY2fBu858Vyn5/rpWi/x rgfA== X-Gm-Message-State: AOJu0Yzexnnvt2JeKWp+TJP1jE5S8cb3AO6B7FWtDm8AC7EkXKFmzKEg fC13jqYJyhJ+5/8sOOh2S4duXrUnWRiXhIbUKls= X-Google-Smtp-Source: AGHT+IE0XVCmwr0SmJJDDwCcla6gpiZj2pDgHCPdPQpxz2U8YdFgYjywz92eZNDZGtB8BErh4/8RYQ== X-Received: by 2002:a7b:cbcf:0:b0:3fb:fa9f:5292 with SMTP id n15-20020a7bcbcf000000b003fbfa9f5292mr171840wmi.25.1694105055741; Thu, 07 Sep 2023 09:44:15 -0700 (PDT) Received: from sagittarius-a.chello.ie (188-141-3-169.dynamic.upc.ie. [188.141.3.169]) by smtp.gmail.com with ESMTPSA id d15-20020adffd8f000000b00317ab75748bsm23822145wrr.49.2023.09.07.09.44.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Sep 2023 09:44:15 -0700 (PDT) From: Bryan O'Donoghue To: rfoss@kernel.org, todor.too@gmail.com, bryan.odonoghue@linaro.org, agross@kernel.org, andersson@kernel.org, konrad.dybcio@linaro.org, mchehab@kernel.org, hverkuil-cisco@xs4all.nl, laurent.pinchart@ideasonboard.com, sakari.ailus@linux.intel.com, andrey.konovalov@linaro.org Cc: linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 02/17] media: qcom: camss: Rename camss struct resources to camss_subdev_resources Date: Thu, 7 Sep 2023 17:43:55 +0100 Message-ID: <20230907164410.36651-3-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20230907164410.36651-1-bryan.odonoghue@linaro.org> References: <20230907164410.36651-1-bryan.odonoghue@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Rename non-specific struct resources {} to struct camss_subdev_resources {} Each logical block in CAMSS has a number of regulators, clocks and resets associated with it. We represent these blocks as v4l subdevices. The name "struct camss_subdev_resources" is a more descriptive and accurate name. Suggested-by: Laurent Pinchart Signed-off-by: Bryan O'Donoghue Acked-by: Konrad Dybcio --- .../media/platform/qcom/camss/camss-csid.c | 2 +- .../media/platform/qcom/camss/camss-csid.h | 4 +- .../media/platform/qcom/camss/camss-csiphy.c | 2 +- .../media/platform/qcom/camss/camss-csiphy.h | 4 +- .../media/platform/qcom/camss/camss-ispif.c | 2 +- .../media/platform/qcom/camss/camss-ispif.h | 4 +- drivers/media/platform/qcom/camss/camss-vfe.c | 2 +- drivers/media/platform/qcom/camss/camss-vfe.h | 4 +- drivers/media/platform/qcom/camss/camss.c | 44 +++++++++---------- drivers/media/platform/qcom/camss/camss.h | 2 +- 10 files changed, 35 insertions(+), 35 deletions(-) diff --git a/drivers/media/platform/qcom/camss/camss-csid.c b/drivers/media= /platform/qcom/camss/camss-csid.c index 9d7fb1adebb98..b1113decdb305 100644 --- a/drivers/media/platform/qcom/camss/camss-csid.c +++ b/drivers/media/platform/qcom/camss/camss-csid.c @@ -566,7 +566,7 @@ static const struct v4l2_ctrl_ops csid_ctrl_ops =3D { * Return 0 on success or a negative error code otherwise */ int msm_csid_subdev_init(struct camss *camss, struct csid_device *csid, - const struct resources *res, u8 id) + const struct camss_subdev_resources *res, u8 id) { struct device *dev =3D camss->dev; struct platform_device *pdev =3D to_platform_device(dev); diff --git a/drivers/media/platform/qcom/camss/camss-csid.h b/drivers/media= /platform/qcom/camss/camss-csid.h index d4b48432a0973..30d94eb2eb041 100644 --- a/drivers/media/platform/qcom/camss/camss-csid.h +++ b/drivers/media/platform/qcom/camss/camss-csid.h @@ -172,7 +172,7 @@ struct csid_device { const struct csid_hw_ops *ops; }; =20 -struct resources; +struct camss_subdev_resources; =20 /* * csid_find_code - Find a format code in an array using array index or fo= rmat code @@ -200,7 +200,7 @@ const struct csid_format *csid_get_fmt_entry(const stru= ct csid_format *formats, u32 code); =20 int msm_csid_subdev_init(struct camss *camss, struct csid_device *csid, - const struct resources *res, u8 id); + const struct camss_subdev_resources *res, u8 id); =20 int msm_csid_register_entity(struct csid_device *csid, struct v4l2_device *v4l2_dev); diff --git a/drivers/media/platform/qcom/camss/camss-csiphy.c b/drivers/med= ia/platform/qcom/camss/camss-csiphy.c index c5ae9c61ee0b1..b1b6c4cf18385 100644 --- a/drivers/media/platform/qcom/camss/camss-csiphy.c +++ b/drivers/media/platform/qcom/camss/camss-csiphy.c @@ -546,7 +546,7 @@ static int csiphy_init_formats(struct v4l2_subdev *sd, */ int msm_csiphy_subdev_init(struct camss *camss, struct csiphy_device *csiphy, - const struct resources *res, u8 id) + const struct camss_subdev_resources *res, u8 id) { struct device *dev =3D camss->dev; struct platform_device *pdev =3D to_platform_device(dev); diff --git a/drivers/media/platform/qcom/camss/camss-csiphy.h b/drivers/med= ia/platform/qcom/camss/camss-csiphy.h index 1c14947f92d35..c9b7fe82b1f0d 100644 --- a/drivers/media/platform/qcom/camss/camss-csiphy.h +++ b/drivers/media/platform/qcom/camss/camss-csiphy.h @@ -83,11 +83,11 @@ struct csiphy_device { unsigned int nformats; }; =20 -struct resources; +struct camss_subdev_resources; =20 int msm_csiphy_subdev_init(struct camss *camss, struct csiphy_device *csiphy, - const struct resources *res, u8 id); + const struct camss_subdev_resources *res, u8 id); =20 int msm_csiphy_register_entity(struct csiphy_device *csiphy, struct v4l2_device *v4l2_dev); diff --git a/drivers/media/platform/qcom/camss/camss-ispif.c b/drivers/medi= a/platform/qcom/camss/camss-ispif.c index 61765b874b9a2..75b8a60806b22 100644 --- a/drivers/media/platform/qcom/camss/camss-ispif.c +++ b/drivers/media/platform/qcom/camss/camss-ispif.c @@ -1095,7 +1095,7 @@ static int ispif_init_formats(struct v4l2_subdev *sd,= struct v4l2_subdev_fh *fh) * Return 0 on success or a negative error code otherwise */ int msm_ispif_subdev_init(struct camss *camss, - const struct resources *res) + const struct camss_subdev_resources *res) { struct device *dev =3D camss->dev; struct ispif_device *ispif =3D camss->ispif; diff --git a/drivers/media/platform/qcom/camss/camss-ispif.h b/drivers/medi= a/platform/qcom/camss/camss-ispif.h index c7c41f7afcaad..dff6d5b35c72e 100644 --- a/drivers/media/platform/qcom/camss/camss-ispif.h +++ b/drivers/media/platform/qcom/camss/camss-ispif.h @@ -66,10 +66,10 @@ struct ispif_device { struct camss *camss; }; =20 -struct resources; +struct camss_subdev_resources; =20 int msm_ispif_subdev_init(struct camss *camss, - const struct resources *res); + const struct camss_subdev_resources *res); =20 int msm_ispif_register_entities(struct ispif_device *ispif, struct v4l2_device *v4l2_dev); diff --git a/drivers/media/platform/qcom/camss/camss-vfe.c b/drivers/media/= platform/qcom/camss/camss-vfe.c index b021f81cef123..e84dcf0f4b2da 100644 --- a/drivers/media/platform/qcom/camss/camss-vfe.c +++ b/drivers/media/platform/qcom/camss/camss-vfe.c @@ -1279,7 +1279,7 @@ static int vfe_init_formats(struct v4l2_subdev *sd, s= truct v4l2_subdev_fh *fh) * Return 0 on success or a negative error code otherwise */ int msm_vfe_subdev_init(struct camss *camss, struct vfe_device *vfe, - const struct resources *res, u8 id) + const struct camss_subdev_resources *res, u8 id) { struct device *dev =3D camss->dev; struct platform_device *pdev =3D to_platform_device(dev); diff --git a/drivers/media/platform/qcom/camss/camss-vfe.h b/drivers/media/= platform/qcom/camss/camss-vfe.h index cbc314c4e244b..b4bae9f65c68f 100644 --- a/drivers/media/platform/qcom/camss/camss-vfe.h +++ b/drivers/media/platform/qcom/camss/camss-vfe.h @@ -153,10 +153,10 @@ struct vfe_device { struct camss_video_ops video_ops; }; =20 -struct resources; +struct camss_subdev_resources; =20 int msm_vfe_subdev_init(struct camss *camss, struct vfe_device *vfe, - const struct resources *res, u8 id); + const struct camss_subdev_resources *res, u8 id); =20 int msm_vfe_register_entities(struct vfe_device *vfe, struct v4l2_device *v4l2_dev); diff --git a/drivers/media/platform/qcom/camss/camss.c b/drivers/media/plat= form/qcom/camss/camss.c index fa0eb30d77c26..718ef8e4f5938 100644 --- a/drivers/media/platform/qcom/camss/camss.c +++ b/drivers/media/platform/qcom/camss/camss.c @@ -31,7 +31,7 @@ #define CAMSS_CLOCK_MARGIN_NUMERATOR 105 #define CAMSS_CLOCK_MARGIN_DENOMINATOR 100 =20 -static const struct resources csiphy_res_8x16[] =3D { +static const struct camss_subdev_resources csiphy_res_8x16[] =3D { /* CSIPHY0 */ { .regulators =3D {}, @@ -57,7 +57,7 @@ static const struct resources csiphy_res_8x16[] =3D { } }; =20 -static const struct resources csid_res_8x16[] =3D { +static const struct camss_subdev_resources csid_res_8x16[] =3D { /* CSID0 */ { .regulators =3D { "vdda" }, @@ -93,7 +93,7 @@ static const struct resources csid_res_8x16[] =3D { }, }; =20 -static const struct resources ispif_res_8x16 =3D { +static const struct camss_subdev_resources ispif_res_8x16 =3D { /* ISPIF */ .clock =3D { "top_ahb", "ahb", "ispif_ahb", "csi0", "csi0_pix", "csi0_rdi", @@ -104,7 +104,7 @@ static const struct resources ispif_res_8x16 =3D { =20 }; =20 -static const struct resources vfe_res_8x16[] =3D { +static const struct camss_subdev_resources vfe_res_8x16[] =3D { /* VFE0 */ { .regulators =3D {}, @@ -126,7 +126,7 @@ static const struct resources vfe_res_8x16[] =3D { } }; =20 -static const struct resources csiphy_res_8x96[] =3D { +static const struct camss_subdev_resources csiphy_res_8x96[] =3D { /* CSIPHY0 */ { .regulators =3D {}, @@ -164,7 +164,7 @@ static const struct resources csiphy_res_8x96[] =3D { } }; =20 -static const struct resources csid_res_8x96[] =3D { +static const struct camss_subdev_resources csid_res_8x96[] =3D { /* CSID0 */ { .regulators =3D { "vdda" }, @@ -234,7 +234,7 @@ static const struct resources csid_res_8x96[] =3D { } }; =20 -static const struct resources ispif_res_8x96 =3D { +static const struct camss_subdev_resources ispif_res_8x96 =3D { /* ISPIF */ .clock =3D { "top_ahb", "ahb", "ispif_ahb", "csi0", "csi0_pix", "csi0_rdi", @@ -246,7 +246,7 @@ static const struct resources ispif_res_8x96 =3D { .interrupt =3D { "ispif" } }; =20 -static const struct resources vfe_res_8x96[] =3D { +static const struct camss_subdev_resources vfe_res_8x96[] =3D { /* VFE0 */ { .regulators =3D {}, @@ -284,7 +284,7 @@ static const struct resources vfe_res_8x96[] =3D { } }; =20 -static const struct resources csiphy_res_660[] =3D { +static const struct camss_subdev_resources csiphy_res_660[] =3D { /* CSIPHY0 */ { .regulators =3D {}, @@ -328,7 +328,7 @@ static const struct resources csiphy_res_660[] =3D { } }; =20 -static const struct resources csid_res_660[] =3D { +static const struct camss_subdev_resources csid_res_660[] =3D { /* CSID0 */ { .regulators =3D { "vdda", "vdd_sec" }, @@ -410,7 +410,7 @@ static const struct resources csid_res_660[] =3D { } }; =20 -static const struct resources ispif_res_660 =3D { +static const struct camss_subdev_resources ispif_res_660 =3D { /* ISPIF */ .clock =3D { "top_ahb", "ahb", "ispif_ahb", "csi0", "csi0_pix", "csi0_rdi", @@ -422,7 +422,7 @@ static const struct resources ispif_res_660 =3D { .interrupt =3D { "ispif" } }; =20 -static const struct resources vfe_res_660[] =3D { +static const struct camss_subdev_resources vfe_res_660[] =3D { /* VFE0 */ { .regulators =3D {}, @@ -466,7 +466,7 @@ static const struct resources vfe_res_660[] =3D { } }; =20 -static const struct resources csiphy_res_845[] =3D { +static const struct camss_subdev_resources csiphy_res_845[] =3D { /* CSIPHY0 */ { .regulators =3D {}, @@ -540,7 +540,7 @@ static const struct resources csiphy_res_845[] =3D { } }; =20 -static const struct resources csid_res_845[] =3D { +static const struct camss_subdev_resources csid_res_845[] =3D { /* CSID0 */ { .regulators =3D { "vdda-phy", "vdda-pll" }, @@ -602,7 +602,7 @@ static const struct resources csid_res_845[] =3D { } }; =20 -static const struct resources vfe_res_845[] =3D { +static const struct camss_subdev_resources vfe_res_845[] =3D { /* VFE0 */ { .regulators =3D {}, @@ -663,7 +663,7 @@ static const struct resources vfe_res_845[] =3D { } }; =20 -static const struct resources csiphy_res_8250[] =3D { +static const struct camss_subdev_resources csiphy_res_8250[] =3D { /* CSIPHY0 */ { .regulators =3D {}, @@ -720,7 +720,7 @@ static const struct resources csiphy_res_8250[] =3D { } }; =20 -static const struct resources csid_res_8250[] =3D { +static const struct camss_subdev_resources csid_res_8250[] =3D { /* CSID0 */ { .regulators =3D { "vdda-phy", "vdda-pll" }, @@ -769,7 +769,7 @@ static const struct resources csid_res_8250[] =3D { } }; =20 -static const struct resources vfe_res_8250[] =3D { +static const struct camss_subdev_resources vfe_res_8250[] =3D { /* VFE0 */ { .regulators =3D {}, @@ -1120,10 +1120,10 @@ static int camss_of_parse_ports(struct camss *camss) */ static int camss_init_subdevices(struct camss *camss) { - const struct resources *csiphy_res; - const struct resources *csid_res; - const struct resources *ispif_res; - const struct resources *vfe_res; + const struct camss_subdev_resources *csiphy_res; + const struct camss_subdev_resources *csid_res; + const struct camss_subdev_resources *ispif_res; + const struct camss_subdev_resources *vfe_res; unsigned int i; int ret; =20 diff --git a/drivers/media/platform/qcom/camss/camss.h b/drivers/media/plat= form/qcom/camss/camss.h index e95211cdb1fd6..9d6ba7b17ff02 100644 --- a/drivers/media/platform/qcom/camss/camss.h +++ b/drivers/media/platform/qcom/camss/camss.h @@ -41,7 +41,7 @@ =20 #define CAMSS_RES_MAX 17 =20 -struct resources { +struct camss_subdev_resources { char *regulators[CAMSS_RES_MAX]; char *clock[CAMSS_RES_MAX]; char *clock_for_reset[CAMSS_RES_MAX]; --=20 2.41.0