From patchwork Thu Sep 14 18:44:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 13385860 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 A94A6EEAA67 for ; Thu, 14 Sep 2023 19:01:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240008AbjINTBZ (ORCPT ); Thu, 14 Sep 2023 15:01:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56860 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241852AbjINTBF (ORCPT ); Thu, 14 Sep 2023 15:01:05 -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 728A330EE for ; Thu, 14 Sep 2023 11:44:24 -0700 (PDT) Received: from pendragon.ideasonboard.com (213-243-189-158.bb.dnainternet.fi [213.243.189.158]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 25C361ABC; Thu, 14 Sep 2023 20:42:50 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1694716970; bh=UW0f/iWMekhhyU/CxDSVk7woYzjDRyAJlE5/h3KX77M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NTPvytFragG477tX+LMYGnUdyM51uLMp1VNnHs3rF/LRBX5dnaeR9aU0B+vYVqXPi aewW3RfVbr6AwhXsQUUJk2ytNlqFOBJ5zenAGRAMwigSLqZn3zDSbS+DtwJ09zysq5 HDoXzlrr6uBoUqJfVxCY/sD2rzgvQkIkjBV3g6KU= From: Laurent Pinchart To: linux-media@vger.kernel.org Cc: Sakari Ailus , Hans Verkuil Subject: [PATCH v2 1/2] media: Pass struct device pointer to fwnode endpoint parsing functions Date: Thu, 14 Sep 2023 21:44:34 +0300 Message-ID: <20230914184435.7807-2-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230914184435.7807-1-laurent.pinchart@ideasonboard.com> References: <20230914184435.7807-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org The v4l2_fwnode_endpoint_parse() and v4l2_fwnode_endpoint_alloc_parse() functions print lots of debugging information with pr_debug(), which can make the log confusing as the information isn't associated with a device. Pass a struct device pointer to the functions to prepare for replacing the pr_debug() calls with dev_dbg(). No functional change is intended in this commit. Signed-off-by: Laurent Pinchart --- drivers/media/i2c/adv748x/adv748x-core.c | 2 +- drivers/media/i2c/adv7604.c | 3 ++- drivers/media/i2c/ar0521.c | 2 +- drivers/media/i2c/ccs/ccs-core.c | 2 +- drivers/media/i2c/ds90ub913.c | 2 +- drivers/media/i2c/ds90ub953.c | 2 +- drivers/media/i2c/ds90ub960.c | 4 ++-- drivers/media/i2c/hi556.c | 2 +- drivers/media/i2c/hi846.c | 2 +- drivers/media/i2c/hi847.c | 2 +- drivers/media/i2c/imx214.c | 2 +- drivers/media/i2c/imx219.c | 2 +- drivers/media/i2c/imx274.c | 2 +- drivers/media/i2c/imx290.c | 2 +- drivers/media/i2c/imx319.c | 2 +- drivers/media/i2c/imx334.c | 2 +- drivers/media/i2c/imx335.c | 2 +- drivers/media/i2c/imx355.c | 2 +- drivers/media/i2c/imx412.c | 2 +- drivers/media/i2c/imx415.c | 2 +- drivers/media/i2c/isl7998x.c | 2 +- drivers/media/i2c/max9286.c | 2 +- drivers/media/i2c/mt9m111.c | 2 +- drivers/media/i2c/mt9p031.c | 3 ++- drivers/media/i2c/mt9v032.c | 3 ++- drivers/media/i2c/og01a1b.c | 2 +- drivers/media/i2c/ov02a10.c | 2 +- drivers/media/i2c/ov08d10.c | 2 +- drivers/media/i2c/ov08x40.c | 2 +- drivers/media/i2c/ov13b10.c | 2 +- drivers/media/i2c/ov2659.c | 3 ++- drivers/media/i2c/ov2680.c | 2 +- drivers/media/i2c/ov2740.c | 2 +- drivers/media/i2c/ov4689.c | 2 +- drivers/media/i2c/ov5640.c | 2 +- drivers/media/i2c/ov5645.c | 2 +- drivers/media/i2c/ov5647.c | 6 +++++- drivers/media/i2c/ov5648.c | 2 +- drivers/media/i2c/ov5670.c | 3 ++- drivers/media/i2c/ov5675.c | 2 +- drivers/media/i2c/ov5693.c | 2 +- drivers/media/i2c/ov7251.c | 2 +- drivers/media/i2c/ov7670.c | 2 +- drivers/media/i2c/ov772x.c | 5 +++-- drivers/media/i2c/ov8856.c | 2 +- drivers/media/i2c/ov8858.c | 2 +- drivers/media/i2c/ov8865.c | 2 +- drivers/media/i2c/ov9282.c | 2 +- drivers/media/i2c/ov9734.c | 2 +- drivers/media/i2c/s5c73m3/s5c73m3-core.c | 2 +- drivers/media/i2c/s5k5baf.c | 2 +- drivers/media/i2c/st-mipid02.c | 6 ++++-- drivers/media/i2c/st-vgxy61.c | 2 +- drivers/media/i2c/tc358743.c | 3 ++- drivers/media/i2c/tc358746.c | 4 ++-- drivers/media/i2c/tda1997x.c | 3 ++- drivers/media/i2c/tvp514x.c | 3 ++- drivers/media/i2c/tvp5150.c | 2 +- drivers/media/i2c/tvp7002.c | 3 ++- drivers/media/pci/intel/ipu3/ipu3-cio2.c | 2 +- drivers/media/pci/intel/ivsc/mei_csi.c | 4 ++-- drivers/media/platform/atmel/atmel-isi.c | 2 +- drivers/media/platform/cadence/cdns-csi2rx.c | 2 +- drivers/media/platform/cadence/cdns-csi2tx.c | 3 ++- drivers/media/platform/intel/pxa_camera.c | 2 +- drivers/media/platform/microchip/microchip-csi2dc.c | 5 +++-- .../media/platform/microchip/microchip-sama5d2-isc.c | 2 +- .../media/platform/microchip/microchip-sama7g5-isc.c | 2 +- drivers/media/platform/nxp/imx-mipi-csis.c | 2 +- drivers/media/platform/nxp/imx8mq-mipi-csi2.c | 2 +- drivers/media/platform/qcom/camss/camss.c | 2 +- drivers/media/platform/renesas/rcar-vin/rcar-core.c | 4 ++-- drivers/media/platform/renesas/rcar-vin/rcar-csi2.c | 2 +- drivers/media/platform/renesas/renesas-ceu.c | 3 ++- .../media/platform/renesas/rzg2l-cru/rzg2l-core.c | 2 +- .../media/platform/renesas/rzg2l-cru/rzg2l-csi2.c | 2 +- drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c | 2 +- .../media/platform/samsung/exynos4-is/media-dev.c | 3 ++- .../media/platform/samsung/exynos4-is/mipi-csis.c | 3 ++- drivers/media/platform/st/stm32/stm32-dcmi.c | 2 +- drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.c | 2 +- .../platform/sunxi/sun6i-csi/sun6i_csi_bridge.c | 2 +- .../platform/sunxi/sun6i-mipi-csi2/sun6i_mipi_csi2.c | 2 +- .../sun8i-a83t-mipi-csi2/sun8i_a83t_mipi_csi2.c | 2 +- drivers/media/platform/ti/am437x/am437x-vpfe.c | 2 +- drivers/media/platform/ti/cal/cal-camerarx.c | 3 ++- drivers/media/platform/ti/davinci/vpif_capture.c | 3 ++- drivers/media/platform/ti/omap3isp/isp.c | 8 ++++---- drivers/media/platform/xilinx/xilinx-csi2rxss.c | 2 +- drivers/media/v4l2-core/v4l2-fwnode.c | 5 +++-- .../staging/media/atomisp/pci/atomisp_csi2_bridge.c | 2 +- .../media/deprecated/atmel/atmel-sama5d2-isc.c | 2 +- .../media/deprecated/atmel/atmel-sama7g5-isc.c | 2 +- drivers/staging/media/imx/imx6-mipi-csi2.c | 2 +- drivers/staging/media/max96712/max96712.c | 2 +- .../staging/media/sunxi/sun6i-isp/sun6i_isp_proc.c | 2 +- drivers/staging/media/tegra-video/csi.c | 2 +- drivers/staging/media/tegra-video/vi.c | 2 +- drivers/staging/media/tegra-video/vip.c | 2 +- include/media/v4l2-fwnode.h | 12 ++++++++++-- 100 files changed, 144 insertions(+), 112 deletions(-) diff --git a/drivers/media/i2c/adv748x/adv748x-core.c b/drivers/media/i2c/adv748x/adv748x-core.c index 3eb6d5e8f082..45bb9a9faeb4 100644 --- a/drivers/media/i2c/adv748x/adv748x-core.c +++ b/drivers/media/i2c/adv748x/adv748x-core.c @@ -616,7 +616,7 @@ static int adv748x_parse_csi2_lanes(struct adv748x_state *state, if (port != ADV748X_PORT_TXA && port != ADV748X_PORT_TXB) return 0; - ret = v4l2_fwnode_endpoint_parse(of_fwnode_handle(ep), &vep); + ret = v4l2_fwnode_endpoint_parse(state->dev, of_fwnode_handle(ep), &vep); if (ret) return ret; diff --git a/drivers/media/i2c/adv7604.c b/drivers/media/i2c/adv7604.c index b202a85fbeaa..81bb4304ef3e 100644 --- a/drivers/media/i2c/adv7604.c +++ b/drivers/media/i2c/adv7604.c @@ -3209,7 +3209,8 @@ static int adv76xx_parse_dt(struct adv76xx_state *state) if (!endpoint) return -EINVAL; - ret = v4l2_fwnode_endpoint_parse(of_fwnode_handle(endpoint), &bus_cfg); + ret = v4l2_fwnode_endpoint_parse(&state->i2c_clients[ADV76XX_PAGE_IO]->dev, + of_fwnode_handle(endpoint), &bus_cfg); of_node_put(endpoint); if (ret) return ret; diff --git a/drivers/media/i2c/ar0521.c b/drivers/media/i2c/ar0521.c index a4e39871e8f7..f6df268c2358 100644 --- a/drivers/media/i2c/ar0521.c +++ b/drivers/media/i2c/ar0521.c @@ -1071,7 +1071,7 @@ static int ar0521_probe(struct i2c_client *client) return -EINVAL; } - ret = v4l2_fwnode_endpoint_parse(endpoint, &ep); + ret = v4l2_fwnode_endpoint_parse(dev, endpoint, &ep); fwnode_handle_put(endpoint); if (ret) { dev_err(dev, "could not parse endpoint\n"); diff --git a/drivers/media/i2c/ccs/ccs-core.c b/drivers/media/i2c/ccs/ccs-core.c index 49e0d9a09530..31f7e1457f8b 100644 --- a/drivers/media/i2c/ccs/ccs-core.c +++ b/drivers/media/i2c/ccs/ccs-core.c @@ -3206,7 +3206,7 @@ static int ccs_get_hwconfig(struct ccs_sensor *sensor, struct device *dev) * Note that we do need to rely on detecting the bus type between CSI-2 * D-PHY and CCP2 as the old bindings did not require it. */ - rval = v4l2_fwnode_endpoint_alloc_parse(ep, &bus_cfg); + rval = v4l2_fwnode_endpoint_alloc_parse(dev, ep, &bus_cfg); if (rval) goto out_err; diff --git a/drivers/media/i2c/ds90ub913.c b/drivers/media/i2c/ds90ub913.c index 4bfa3b3cf619..07b5388e0469 100644 --- a/drivers/media/i2c/ds90ub913.c +++ b/drivers/media/i2c/ds90ub913.c @@ -688,7 +688,7 @@ static int ub913_parse_dt(struct ub913_data *priv) if (!ep_fwnode) return dev_err_probe(dev, -ENOENT, "No sink endpoint\n"); - ret = v4l2_fwnode_endpoint_parse(ep_fwnode, &vep); + ret = v4l2_fwnode_endpoint_parse(dev, ep_fwnode, &vep); fwnode_handle_put(ep_fwnode); diff --git a/drivers/media/i2c/ds90ub953.c b/drivers/media/i2c/ds90ub953.c index dc394e22a42c..2b4acdf4a2e6 100644 --- a/drivers/media/i2c/ds90ub953.c +++ b/drivers/media/i2c/ds90ub953.c @@ -1144,7 +1144,7 @@ static int ub953_parse_dt(struct ub953_data *priv) if (!ep_fwnode) return dev_err_probe(dev, -ENOENT, "no endpoint found\n"); - ret = v4l2_fwnode_endpoint_parse(ep_fwnode, &vep); + ret = v4l2_fwnode_endpoint_parse(dev, ep_fwnode, &vep); fwnode_handle_put(ep_fwnode); diff --git a/drivers/media/i2c/ds90ub960.c b/drivers/media/i2c/ds90ub960.c index 8ba5750f5a23..d99249cf0412 100644 --- a/drivers/media/i2c/ds90ub960.c +++ b/drivers/media/i2c/ds90ub960.c @@ -1129,7 +1129,7 @@ static int ub960_parse_dt_txport(struct ub960_data *priv, txport->nport = nport; vep.bus_type = V4L2_MBUS_CSI2_DPHY; - ret = v4l2_fwnode_endpoint_alloc_parse(ep_fwnode, &vep); + ret = v4l2_fwnode_endpoint_alloc_parse(dev, ep_fwnode, &vep); if (ret) { dev_err(dev, "tx%u: failed to parse endpoint data\n", nport); goto err_free_txport; @@ -3346,7 +3346,7 @@ static int ub960_parse_dt_rxport_ep_properties(struct ub960_data *priv, } vep.bus_type = V4L2_MBUS_PARALLEL; - ret = v4l2_fwnode_endpoint_parse(ep_fwnode, &vep); + ret = v4l2_fwnode_endpoint_parse(dev, ep_fwnode, &vep); if (ret) { dev_err(dev, "rx%u: failed to parse endpoint data\n", nport); goto err_put_source_ep_fwnode; diff --git a/drivers/media/i2c/hi556.c b/drivers/media/i2c/hi556.c index fd56ba138739..308636ff5b5c 100644 --- a/drivers/media/i2c/hi556.c +++ b/drivers/media/i2c/hi556.c @@ -1208,7 +1208,7 @@ static int hi556_check_hwcfg(struct device *dev) if (!ep) return -ENXIO; - ret = v4l2_fwnode_endpoint_alloc_parse(ep, &bus_cfg); + ret = v4l2_fwnode_endpoint_alloc_parse(dev, ep, &bus_cfg); fwnode_handle_put(ep); if (ret) return ret; diff --git a/drivers/media/i2c/hi846.c b/drivers/media/i2c/hi846.c index fa0038749a3b..37b3ac60df9f 100644 --- a/drivers/media/i2c/hi846.c +++ b/drivers/media/i2c/hi846.c @@ -2003,7 +2003,7 @@ static int hi846_parse_dt(struct hi846 *hi846, struct device *dev) return -ENXIO; } - ret = v4l2_fwnode_endpoint_alloc_parse(ep, &bus_cfg); + ret = v4l2_fwnode_endpoint_alloc_parse(dev, ep, &bus_cfg); fwnode_handle_put(ep); if (ret) { dev_err(dev, "failed to parse endpoint node: %d\n", ret); diff --git a/drivers/media/i2c/hi847.c b/drivers/media/i2c/hi847.c index 32547d7a2659..d618847418c8 100644 --- a/drivers/media/i2c/hi847.c +++ b/drivers/media/i2c/hi847.c @@ -2864,7 +2864,7 @@ static int hi847_check_hwcfg(struct device *dev) if (!ep) return -ENXIO; - ret = v4l2_fwnode_endpoint_alloc_parse(ep, &bus_cfg); + ret = v4l2_fwnode_endpoint_alloc_parse(dev, ep, &bus_cfg); fwnode_handle_put(ep); if (ret) return ret; diff --git a/drivers/media/i2c/imx214.c b/drivers/media/i2c/imx214.c index 2f9c8582f940..2989a810d2dc 100644 --- a/drivers/media/i2c/imx214.c +++ b/drivers/media/i2c/imx214.c @@ -886,7 +886,7 @@ static int imx214_parse_fwnode(struct device *dev) return -EINVAL; } - ret = v4l2_fwnode_endpoint_alloc_parse(endpoint, &bus_cfg); + ret = v4l2_fwnode_endpoint_alloc_parse(dev, endpoint, &bus_cfg); if (ret) { dev_err(dev, "parsing endpoint node failed\n"); goto done; diff --git a/drivers/media/i2c/imx219.c b/drivers/media/i2c/imx219.c index a1136fdfbed2..7629c1f0ebe3 100644 --- a/drivers/media/i2c/imx219.c +++ b/drivers/media/i2c/imx219.c @@ -1283,7 +1283,7 @@ static int imx219_check_hwcfg(struct device *dev, struct imx219 *imx219) return -EINVAL; } - if (v4l2_fwnode_endpoint_alloc_parse(endpoint, &ep_cfg)) { + if (v4l2_fwnode_endpoint_alloc_parse(dev, endpoint, &ep_cfg)) { dev_err(dev, "could not parse endpoint\n"); goto error_out; } diff --git a/drivers/media/i2c/imx274.c b/drivers/media/i2c/imx274.c index f33b692e6951..f270443ee98d 100644 --- a/drivers/media/i2c/imx274.c +++ b/drivers/media/i2c/imx274.c @@ -1971,7 +1971,7 @@ static int imx274_fwnode_parse(struct device *dev) return -EINVAL; } - ret = v4l2_fwnode_endpoint_parse(endpoint, &ep); + ret = v4l2_fwnode_endpoint_parse(dev, endpoint, &ep); fwnode_handle_put(endpoint); if (ret == -ENXIO) { dev_err(dev, "Unsupported bus type, should be CSI2\n"); diff --git a/drivers/media/i2c/imx290.c b/drivers/media/i2c/imx290.c index 29098612813c..b88458ff98dd 100644 --- a/drivers/media/i2c/imx290.c +++ b/drivers/media/i2c/imx290.c @@ -1470,7 +1470,7 @@ static int imx290_parse_dt(struct imx290 *imx290) return -EINVAL; } - ret = v4l2_fwnode_endpoint_alloc_parse(endpoint, &ep); + ret = v4l2_fwnode_endpoint_alloc_parse(imx290->dev, endpoint, &ep); fwnode_handle_put(endpoint); if (ret == -ENXIO) { dev_err(imx290->dev, "Unsupported bus type, should be CSI2\n"); diff --git a/drivers/media/i2c/imx319.c b/drivers/media/i2c/imx319.c index 52ebb096e107..985d097a97c3 100644 --- a/drivers/media/i2c/imx319.c +++ b/drivers/media/i2c/imx319.c @@ -2382,7 +2382,7 @@ static struct imx319_hwcfg *imx319_get_hwcfg(struct device *dev) if (!ep) return NULL; - ret = v4l2_fwnode_endpoint_alloc_parse(ep, &bus_cfg); + ret = v4l2_fwnode_endpoint_alloc_parse(dev, ep, &bus_cfg); if (ret) goto out_err; diff --git a/drivers/media/i2c/imx334.c b/drivers/media/i2c/imx334.c index 91c79af70734..1435272a86c1 100644 --- a/drivers/media/i2c/imx334.c +++ b/drivers/media/i2c/imx334.c @@ -1153,7 +1153,7 @@ static int imx334_parse_hw_config(struct imx334 *imx334) if (!ep) return -ENXIO; - ret = v4l2_fwnode_endpoint_alloc_parse(ep, &bus_cfg); + ret = v4l2_fwnode_endpoint_alloc_parse(imx334->dev, ep, &bus_cfg); fwnode_handle_put(ep); if (ret) return ret; diff --git a/drivers/media/i2c/imx335.c b/drivers/media/i2c/imx335.c index 482a0b7f040a..be33b45e3c7a 100644 --- a/drivers/media/i2c/imx335.c +++ b/drivers/media/i2c/imx335.c @@ -807,7 +807,7 @@ static int imx335_parse_hw_config(struct imx335 *imx335) if (!ep) return -ENXIO; - ret = v4l2_fwnode_endpoint_alloc_parse(ep, &bus_cfg); + ret = v4l2_fwnode_endpoint_alloc_parse(imx335->dev, ep, &bus_cfg); fwnode_handle_put(ep); if (ret) return ret; diff --git a/drivers/media/i2c/imx355.c b/drivers/media/i2c/imx355.c index 9c79ae8dc842..5b89bbe77fcc 100644 --- a/drivers/media/i2c/imx355.c +++ b/drivers/media/i2c/imx355.c @@ -1671,7 +1671,7 @@ static struct imx355_hwcfg *imx355_get_hwcfg(struct device *dev) if (!ep) return NULL; - ret = v4l2_fwnode_endpoint_alloc_parse(ep, &bus_cfg); + ret = v4l2_fwnode_endpoint_alloc_parse(dev, ep, &bus_cfg); if (ret) goto out_err; diff --git a/drivers/media/i2c/imx412.c b/drivers/media/i2c/imx412.c index c7e862ae4040..9191974f2b82 100644 --- a/drivers/media/i2c/imx412.c +++ b/drivers/media/i2c/imx412.c @@ -969,7 +969,7 @@ static int imx412_parse_hw_config(struct imx412 *imx412) if (!ep) return -ENXIO; - ret = v4l2_fwnode_endpoint_alloc_parse(ep, &bus_cfg); + ret = v4l2_fwnode_endpoint_alloc_parse(imx412->dev, ep, &bus_cfg); fwnode_handle_put(ep); if (ret) return ret; diff --git a/drivers/media/i2c/imx415.c b/drivers/media/i2c/imx415.c index 9a7ac81edc28..d2bf7ee511ac 100644 --- a/drivers/media/i2c/imx415.c +++ b/drivers/media/i2c/imx415.c @@ -1077,7 +1077,7 @@ static int imx415_parse_hw_config(struct imx415 *sensor) if (!ep) return -ENXIO; - ret = v4l2_fwnode_endpoint_alloc_parse(ep, &bus_cfg); + ret = v4l2_fwnode_endpoint_alloc_parse(sensor->dev, ep, &bus_cfg); fwnode_handle_put(ep); if (ret) return ret; diff --git a/drivers/media/i2c/isl7998x.c b/drivers/media/i2c/isl7998x.c index 73460688c356..bed728c5250c 100644 --- a/drivers/media/i2c/isl7998x.c +++ b/drivers/media/i2c/isl7998x.c @@ -1493,7 +1493,7 @@ static int isl7998x_probe(struct i2c_client *client) if (!ep) return dev_err_probe(dev, -EINVAL, "Missing endpoint node\n"); - ret = v4l2_fwnode_endpoint_parse(ep, &endpoint); + ret = v4l2_fwnode_endpoint_parse(dev, ep, &endpoint); fwnode_handle_put(ep); if (ret) return dev_err_probe(dev, ret, "Failed to parse endpoint\n"); diff --git a/drivers/media/i2c/max9286.c b/drivers/media/i2c/max9286.c index fc1cf196ef01..78d46bdc2e9f 100644 --- a/drivers/media/i2c/max9286.c +++ b/drivers/media/i2c/max9286.c @@ -1474,7 +1474,7 @@ static int max9286_parse_dt(struct max9286_priv *priv) int ret; ret = v4l2_fwnode_endpoint_parse( - of_fwnode_handle(node), &vep); + dev, of_fwnode_handle(node), &vep); if (ret) { of_node_put(node); return ret; diff --git a/drivers/media/i2c/mt9m111.c b/drivers/media/i2c/mt9m111.c index 1f44b72e8a70..0545647d8c77 100644 --- a/drivers/media/i2c/mt9m111.c +++ b/drivers/media/i2c/mt9m111.c @@ -1226,7 +1226,7 @@ static int mt9m111_probe_fw(struct i2c_client *client, struct mt9m111 *mt9m111) if (!np) return -EINVAL; - ret = v4l2_fwnode_endpoint_parse(np, &bus_cfg); + ret = v4l2_fwnode_endpoint_parse(&client->dev, np, &bus_cfg); if (ret) goto out_put_fw; diff --git a/drivers/media/i2c/mt9p031.c b/drivers/media/i2c/mt9p031.c index 348f1e1098fb..e69607c0acb0 100644 --- a/drivers/media/i2c/mt9p031.c +++ b/drivers/media/i2c/mt9p031.c @@ -1084,7 +1084,8 @@ mt9p031_get_pdata(struct i2c_client *client) if (!np) return NULL; - if (v4l2_fwnode_endpoint_parse(of_fwnode_handle(np), &endpoint) < 0) + if (v4l2_fwnode_endpoint_parse(&client->dev, of_fwnode_handle(np), + &endpoint) < 0) goto done; pdata = devm_kzalloc(&client->dev, sizeof(*pdata), GFP_KERNEL); diff --git a/drivers/media/i2c/mt9v032.c b/drivers/media/i2c/mt9v032.c index 1c6f6cea1204..2c554acb4385 100644 --- a/drivers/media/i2c/mt9v032.c +++ b/drivers/media/i2c/mt9v032.c @@ -1012,7 +1012,8 @@ mt9v032_get_pdata(struct i2c_client *client) if (!np) return NULL; - if (v4l2_fwnode_endpoint_parse(of_fwnode_handle(np), &endpoint) < 0) + if (v4l2_fwnode_endpoint_parse(&client->dev, of_fwnode_handle(np), + &endpoint) < 0) goto done; pdata = devm_kzalloc(&client->dev, sizeof(*pdata), GFP_KERNEL); diff --git a/drivers/media/i2c/og01a1b.c b/drivers/media/i2c/og01a1b.c index 365ce5684583..9eeae7cd384c 100644 --- a/drivers/media/i2c/og01a1b.c +++ b/drivers/media/i2c/og01a1b.c @@ -976,7 +976,7 @@ static int og01a1b_check_hwcfg(struct device *dev) if (!ep) return -ENXIO; - ret = v4l2_fwnode_endpoint_alloc_parse(ep, &bus_cfg); + ret = v4l2_fwnode_endpoint_alloc_parse(dev, ep, &bus_cfg); fwnode_handle_put(ep); if (ret) return ret; diff --git a/drivers/media/i2c/ov02a10.c b/drivers/media/i2c/ov02a10.c index 741d977a76f3..fd333b56339e 100644 --- a/drivers/media/i2c/ov02a10.c +++ b/drivers/media/i2c/ov02a10.c @@ -821,7 +821,7 @@ static int ov02a10_check_hwcfg(struct device *dev, struct ov02a10 *ov02a10) if (!ep) return -ENXIO; - ret = v4l2_fwnode_endpoint_alloc_parse(ep, &bus_cfg); + ret = v4l2_fwnode_endpoint_alloc_parse(dev, ep, &bus_cfg); fwnode_handle_put(ep); if (ret) return ret; diff --git a/drivers/media/i2c/ov08d10.c b/drivers/media/i2c/ov08d10.c index 7d55d4ca24de..26228ad98821 100644 --- a/drivers/media/i2c/ov08d10.c +++ b/drivers/media/i2c/ov08d10.c @@ -1375,7 +1375,7 @@ static int ov08d10_get_hwcfg(struct ov08d10 *ov08d10, struct device *dev) if (!ep) return -ENXIO; - ret = v4l2_fwnode_endpoint_alloc_parse(ep, &bus_cfg); + ret = v4l2_fwnode_endpoint_alloc_parse(dev, ep, &bus_cfg); fwnode_handle_put(ep); if (ret) return ret; diff --git a/drivers/media/i2c/ov08x40.c b/drivers/media/i2c/ov08x40.c index 637da4df6901..87b30497a5a4 100644 --- a/drivers/media/i2c/ov08x40.c +++ b/drivers/media/i2c/ov08x40.c @@ -3172,7 +3172,7 @@ static int ov08x40_check_hwcfg(struct device *dev) if (!ep) return -ENXIO; - ret = v4l2_fwnode_endpoint_alloc_parse(ep, &bus_cfg); + ret = v4l2_fwnode_endpoint_alloc_parse(dev, ep, &bus_cfg); fwnode_handle_put(ep); if (ret) return ret; diff --git a/drivers/media/i2c/ov13b10.c b/drivers/media/i2c/ov13b10.c index 8ebdb32dd3db..67abc160651d 100644 --- a/drivers/media/i2c/ov13b10.c +++ b/drivers/media/i2c/ov13b10.c @@ -1436,7 +1436,7 @@ static int ov13b10_check_hwcfg(struct device *dev) return -EINVAL; } - ret = v4l2_fwnode_endpoint_alloc_parse(ep, &bus_cfg); + ret = v4l2_fwnode_endpoint_alloc_parse(dev, ep, &bus_cfg); fwnode_handle_put(ep); if (ret) return ret; diff --git a/drivers/media/i2c/ov2659.c b/drivers/media/i2c/ov2659.c index 2c3dbe164eb6..46d6ce987411 100644 --- a/drivers/media/i2c/ov2659.c +++ b/drivers/media/i2c/ov2659.c @@ -1392,7 +1392,8 @@ ov2659_get_pdata(struct i2c_client *client) if (!endpoint) return NULL; - ret = v4l2_fwnode_endpoint_alloc_parse(of_fwnode_handle(endpoint), + ret = v4l2_fwnode_endpoint_alloc_parse(&client->dev, + of_fwnode_handle(endpoint), &bus_cfg); if (ret) { pdata = NULL; diff --git a/drivers/media/i2c/ov2680.c b/drivers/media/i2c/ov2680.c index 72bab0ff8a36..51e60ec83f09 100644 --- a/drivers/media/i2c/ov2680.c +++ b/drivers/media/i2c/ov2680.c @@ -1027,7 +1027,7 @@ static int ov2680_parse_dt(struct ov2680_dev *sensor) return dev_err_probe(dev, -EPROBE_DEFER, "waiting for fwnode graph endpoint\n"); - ret = v4l2_fwnode_endpoint_alloc_parse(ep_fwnode, &bus_cfg); + ret = v4l2_fwnode_endpoint_alloc_parse(dev, ep_fwnode, &bus_cfg); fwnode_handle_put(ep_fwnode); if (ret) return ret; diff --git a/drivers/media/i2c/ov2740.c b/drivers/media/i2c/ov2740.c index 41d4f85470fd..49e1a3d019c9 100644 --- a/drivers/media/i2c/ov2740.c +++ b/drivers/media/i2c/ov2740.c @@ -1006,7 +1006,7 @@ static int ov2740_check_hwcfg(struct device *dev) if (!ep) return -ENXIO; - ret = v4l2_fwnode_endpoint_alloc_parse(ep, &bus_cfg); + ret = v4l2_fwnode_endpoint_alloc_parse(dev, ep, &bus_cfg); fwnode_handle_put(ep); if (ret) return ret; diff --git a/drivers/media/i2c/ov4689.c b/drivers/media/i2c/ov4689.c index fda217d2cb10..0ddc40f7a1a0 100644 --- a/drivers/media/i2c/ov4689.c +++ b/drivers/media/i2c/ov4689.c @@ -851,7 +851,7 @@ static int ov4689_check_hwcfg(struct device *dev) if (!endpoint) return -EINVAL; - ret = v4l2_fwnode_endpoint_alloc_parse(endpoint, &bus_cfg); + ret = v4l2_fwnode_endpoint_alloc_parse(dev, endpoint, &bus_cfg); fwnode_handle_put(endpoint); if (ret) return ret; diff --git a/drivers/media/i2c/ov5640.c b/drivers/media/i2c/ov5640.c index 40532f7bcabe..6f174df0980d 100644 --- a/drivers/media/i2c/ov5640.c +++ b/drivers/media/i2c/ov5640.c @@ -3861,7 +3861,7 @@ static int ov5640_probe(struct i2c_client *client) return -EINVAL; } - ret = v4l2_fwnode_endpoint_parse(endpoint, &sensor->ep); + ret = v4l2_fwnode_endpoint_parse(dev, endpoint, &sensor->ep); fwnode_handle_put(endpoint); if (ret) { dev_err(dev, "Could not parse endpoint\n"); diff --git a/drivers/media/i2c/ov5645.c b/drivers/media/i2c/ov5645.c index a70db7e601a4..9e6cc51bffa0 100644 --- a/drivers/media/i2c/ov5645.c +++ b/drivers/media/i2c/ov5645.c @@ -1059,7 +1059,7 @@ static int ov5645_probe(struct i2c_client *client) return -EINVAL; } - ret = v4l2_fwnode_endpoint_parse(of_fwnode_handle(endpoint), + ret = v4l2_fwnode_endpoint_parse(dev, of_fwnode_handle(endpoint), &ov5645->ep); of_node_put(endpoint); diff --git a/drivers/media/i2c/ov5647.c b/drivers/media/i2c/ov5647.c index 8de398423b7c..97a7f0485e99 100644 --- a/drivers/media/i2c/ov5647.c +++ b/drivers/media/i2c/ov5647.c @@ -97,6 +97,7 @@ struct ov5647_mode { }; struct ov5647 { + struct device *dev; struct v4l2_subdev sd; struct media_pad pad; struct mutex lock; @@ -1373,7 +1374,8 @@ static int ov5647_parse_dt(struct ov5647 *sensor, struct device_node *np) if (!ep) return -EINVAL; - ret = v4l2_fwnode_endpoint_parse(of_fwnode_handle(ep), &bus_cfg); + ret = v4l2_fwnode_endpoint_parse(sensor->dev, of_fwnode_handle(ep), + &bus_cfg); if (ret) goto out; @@ -1399,6 +1401,8 @@ static int ov5647_probe(struct i2c_client *client) if (!sensor) return -ENOMEM; + sensor->dev = dev; + if (IS_ENABLED(CONFIG_OF) && np) { ret = ov5647_parse_dt(sensor, np); if (ret) { diff --git a/drivers/media/i2c/ov5648.c b/drivers/media/i2c/ov5648.c index aa10eb4e3991..3ed234145c95 100644 --- a/drivers/media/i2c/ov5648.c +++ b/drivers/media/i2c/ov5648.c @@ -2464,7 +2464,7 @@ static int ov5648_probe(struct i2c_client *client) sensor->endpoint.bus_type = V4L2_MBUS_CSI2_DPHY; - ret = v4l2_fwnode_endpoint_alloc_parse(handle, &sensor->endpoint); + ret = v4l2_fwnode_endpoint_alloc_parse(dev, handle, &sensor->endpoint); fwnode_handle_put(handle); if (ret) { dev_err(dev, "failed to parse endpoint node\n"); diff --git a/drivers/media/i2c/ov5670.c b/drivers/media/i2c/ov5670.c index 29e773a997dd..5958473e3ad5 100644 --- a/drivers/media/i2c/ov5670.c +++ b/drivers/media/i2c/ov5670.c @@ -2726,7 +2726,8 @@ static int ov5670_probe(struct i2c_client *client) ov5670->endpoint.bus_type = V4L2_MBUS_CSI2_DPHY; ov5670->endpoint.bus.mipi_csi2.num_data_lanes = 2; - ret = v4l2_fwnode_endpoint_alloc_parse(handle, &ov5670->endpoint); + ret = v4l2_fwnode_endpoint_alloc_parse(&client->dev, handle, + &ov5670->endpoint); fwnode_handle_put(handle); if (ret) return dev_err_probe(&client->dev, ret, "Endpoint parse failed\n"); diff --git a/drivers/media/i2c/ov5675.c b/drivers/media/i2c/ov5675.c index d5a2a5f82312..8a2443818863 100644 --- a/drivers/media/i2c/ov5675.c +++ b/drivers/media/i2c/ov5675.c @@ -1273,7 +1273,7 @@ static int ov5675_get_hwcfg(struct ov5675 *ov5675, struct device *dev) if (!ep) return -ENXIO; - ret = v4l2_fwnode_endpoint_alloc_parse(ep, &bus_cfg); + ret = v4l2_fwnode_endpoint_alloc_parse(dev, ep, &bus_cfg); fwnode_handle_put(ep); if (ret) return ret; diff --git a/drivers/media/i2c/ov5693.c b/drivers/media/i2c/ov5693.c index 488ee6d9d301..24e8bac4fd8c 100644 --- a/drivers/media/i2c/ov5693.c +++ b/drivers/media/i2c/ov5693.c @@ -1231,7 +1231,7 @@ static int ov5693_check_hwcfg(struct ov5693_device *ov5693) if (!endpoint) return -EPROBE_DEFER; /* Could be provided by cio2-bridge */ - ret = v4l2_fwnode_endpoint_alloc_parse(endpoint, &bus_cfg); + ret = v4l2_fwnode_endpoint_alloc_parse(ov5693->dev, endpoint, &bus_cfg); fwnode_handle_put(endpoint); if (ret) return ret; diff --git a/drivers/media/i2c/ov7251.c b/drivers/media/i2c/ov7251.c index 675fb37a6fea..b47ceedb5888 100644 --- a/drivers/media/i2c/ov7251.c +++ b/drivers/media/i2c/ov7251.c @@ -1467,7 +1467,7 @@ static int ov7251_check_hwcfg(struct ov7251 *ov7251) if (!endpoint) return -EPROBE_DEFER; /* could be provided by cio2-bridge */ - ret = v4l2_fwnode_endpoint_alloc_parse(endpoint, &bus_cfg); + ret = v4l2_fwnode_endpoint_alloc_parse(ov7251->dev, endpoint, &bus_cfg); fwnode_handle_put(endpoint); if (ret) return dev_err_probe(ov7251->dev, ret, diff --git a/drivers/media/i2c/ov7670.c b/drivers/media/i2c/ov7670.c index 172483597c54..fc1d11e5fc48 100644 --- a/drivers/media/i2c/ov7670.c +++ b/drivers/media/i2c/ov7670.c @@ -1798,7 +1798,7 @@ static int ov7670_parse_dt(struct device *dev, if (!ep) return -EINVAL; - ret = v4l2_fwnode_endpoint_parse(ep, &bus_cfg); + ret = v4l2_fwnode_endpoint_parse(dev, ep, &bus_cfg); fwnode_handle_put(ep); if (ret) return ret; diff --git a/drivers/media/i2c/ov772x.c b/drivers/media/i2c/ov772x.c index 7618b58a7ad0..2e12a89a166e 100644 --- a/drivers/media/i2c/ov772x.c +++ b/drivers/media/i2c/ov772x.c @@ -1389,11 +1389,12 @@ static int ov772x_parse_dt(struct i2c_client *client, * time. v4l2_fwnode_endpoint_alloc_parse() will not fail if * 'bus-type' is not specified. */ - ret = v4l2_fwnode_endpoint_alloc_parse(ep, &bus_cfg); + ret = v4l2_fwnode_endpoint_alloc_parse(&client->dev, ep, &bus_cfg); if (ret) { bus_cfg = (struct v4l2_fwnode_endpoint) { .bus_type = V4L2_MBUS_BT656 }; - ret = v4l2_fwnode_endpoint_alloc_parse(ep, &bus_cfg); + ret = v4l2_fwnode_endpoint_alloc_parse(&client->dev, ep, + &bus_cfg); if (ret) goto error_fwnode_put; } diff --git a/drivers/media/i2c/ov8856.c b/drivers/media/i2c/ov8856.c index f053c3a7676a..eede88ce8221 100644 --- a/drivers/media/i2c/ov8856.c +++ b/drivers/media/i2c/ov8856.c @@ -2354,7 +2354,7 @@ static int ov8856_get_hwcfg(struct ov8856 *ov8856, struct device *dev) if (!ep) return -ENXIO; - ret = v4l2_fwnode_endpoint_alloc_parse(ep, &bus_cfg); + ret = v4l2_fwnode_endpoint_alloc_parse(dev, ep, &bus_cfg); fwnode_handle_put(ep); if (ret) return ret; diff --git a/drivers/media/i2c/ov8858.c b/drivers/media/i2c/ov8858.c index 3af6125a2eee..453f1d6975fd 100644 --- a/drivers/media/i2c/ov8858.c +++ b/drivers/media/i2c/ov8858.c @@ -1849,7 +1849,7 @@ static int ov8858_parse_of(struct ov8858 *ov8858) return -EINVAL; } - ret = v4l2_fwnode_endpoint_parse(endpoint, &vep); + ret = v4l2_fwnode_endpoint_parse(dev, endpoint, &vep); if (ret) { dev_err(dev, "Failed to parse endpoint: %d\n", ret); fwnode_handle_put(endpoint); diff --git a/drivers/media/i2c/ov8865.c b/drivers/media/i2c/ov8865.c index f2213c6158d3..ad1c449f6e8e 100644 --- a/drivers/media/i2c/ov8865.c +++ b/drivers/media/i2c/ov8865.c @@ -2987,7 +2987,7 @@ static int ov8865_probe(struct i2c_client *client) sensor->endpoint.bus_type = V4L2_MBUS_CSI2_DPHY; - ret = v4l2_fwnode_endpoint_alloc_parse(handle, &sensor->endpoint); + ret = v4l2_fwnode_endpoint_alloc_parse(dev, handle, &sensor->endpoint); fwnode_handle_put(handle); if (ret) { dev_err(dev, "failed to parse endpoint node\n"); diff --git a/drivers/media/i2c/ov9282.c b/drivers/media/i2c/ov9282.c index 068c7449f50e..1692a748ab6c 100644 --- a/drivers/media/i2c/ov9282.c +++ b/drivers/media/i2c/ov9282.c @@ -1156,7 +1156,7 @@ static int ov9282_parse_hw_config(struct ov9282 *ov9282) if (!ep) return -ENXIO; - ret = v4l2_fwnode_endpoint_alloc_parse(ep, &bus_cfg); + ret = v4l2_fwnode_endpoint_alloc_parse(ov9282->dev, ep, &bus_cfg); fwnode_handle_put(ep); if (ret) return ret; diff --git a/drivers/media/i2c/ov9734.c b/drivers/media/i2c/ov9734.c index b6244772bc59..80410be2ff98 100644 --- a/drivers/media/i2c/ov9734.c +++ b/drivers/media/i2c/ov9734.c @@ -898,7 +898,7 @@ static int ov9734_check_hwcfg(struct device *dev) if (!ep) return -ENXIO; - ret = v4l2_fwnode_endpoint_alloc_parse(ep, &bus_cfg); + ret = v4l2_fwnode_endpoint_alloc_parse(dev, ep, &bus_cfg); fwnode_handle_put(ep); if (ret) return ret; diff --git a/drivers/media/i2c/s5c73m3/s5c73m3-core.c b/drivers/media/i2c/s5c73m3/s5c73m3-core.c index ed5b10731a14..84edd2ba7b85 100644 --- a/drivers/media/i2c/s5c73m3/s5c73m3-core.c +++ b/drivers/media/i2c/s5c73m3/s5c73m3-core.c @@ -1561,7 +1561,7 @@ static int s5c73m3_get_dt_data(struct s5c73m3 *state) return 0; } - ret = v4l2_fwnode_endpoint_parse(of_fwnode_handle(node_ep), &ep); + ret = v4l2_fwnode_endpoint_parse(dev, of_fwnode_handle(node_ep), &ep); of_node_put(node_ep); if (ret) return ret; diff --git a/drivers/media/i2c/s5k5baf.c b/drivers/media/i2c/s5k5baf.c index 67da2045f543..bf113183080b 100644 --- a/drivers/media/i2c/s5k5baf.c +++ b/drivers/media/i2c/s5k5baf.c @@ -1842,7 +1842,7 @@ static int s5k5baf_parse_device_node(struct s5k5baf *state, struct device *dev) return -EINVAL; } - ret = v4l2_fwnode_endpoint_parse(of_fwnode_handle(node_ep), &ep); + ret = v4l2_fwnode_endpoint_parse(dev, of_fwnode_handle(node_ep), &ep); of_node_put(node_ep); if (ret) return ret; diff --git a/drivers/media/i2c/st-mipid02.c b/drivers/media/i2c/st-mipid02.c index fa27638edc07..1f8906bbdeb6 100644 --- a/drivers/media/i2c/st-mipid02.c +++ b/drivers/media/i2c/st-mipid02.c @@ -903,7 +903,8 @@ static int mipid02_parse_rx_ep(struct mipid02_dev *bridge) goto error; } - ret = v4l2_fwnode_endpoint_parse(of_fwnode_handle(ep_node), &ep); + ret = v4l2_fwnode_endpoint_parse(&client->dev, of_fwnode_handle(ep_node), + &ep); if (ret) { dev_err(&client->dev, "Could not parse v4l2 endpoint %d\n", ret); @@ -964,7 +965,8 @@ static int mipid02_parse_tx_ep(struct mipid02_dev *bridge) goto error; } - ret = v4l2_fwnode_endpoint_parse(of_fwnode_handle(ep_node), &ep); + ret = v4l2_fwnode_endpoint_parse(&client->dev, of_fwnode_handle(ep_node), + &ep); if (ret) { dev_err(&client->dev, "Could not parse v4l2 endpoint\n"); goto error_of_node_put; diff --git a/drivers/media/i2c/st-vgxy61.c b/drivers/media/i2c/st-vgxy61.c index 30f82ca344c4..9125bae1116d 100644 --- a/drivers/media/i2c/st-vgxy61.c +++ b/drivers/media/i2c/st-vgxy61.c @@ -1504,7 +1504,7 @@ static int vgxy61_tx_from_ep(struct vgxy61_dev *sensor, unsigned int p, l, i; int ret; - ret = v4l2_fwnode_endpoint_alloc_parse(handle, &ep); + ret = v4l2_fwnode_endpoint_alloc_parse(&client->dev, handle, &ep); if (ret) return -EINVAL; diff --git a/drivers/media/i2c/tc358743.c b/drivers/media/i2c/tc358743.c index 2785935da497..290512114dee 100644 --- a/drivers/media/i2c/tc358743.c +++ b/drivers/media/i2c/tc358743.c @@ -1901,7 +1901,8 @@ static int tc358743_probe_of(struct tc358743_state *state) return -EINVAL; } - ret = v4l2_fwnode_endpoint_alloc_parse(of_fwnode_handle(ep), &endpoint); + ret = v4l2_fwnode_endpoint_alloc_parse(dev, of_fwnode_handle(ep), + &endpoint); if (ret) { dev_err(dev, "failed to parse endpoint\n"); goto put_node; diff --git a/drivers/media/i2c/tc358746.c b/drivers/media/i2c/tc358746.c index 566f5eaddd57..e703fcb6737d 100644 --- a/drivers/media/i2c/tc358746.c +++ b/drivers/media/i2c/tc358746.c @@ -1316,7 +1316,7 @@ tc358746_init_output_port(struct tc358746 *tc358746, unsigned long refclk) /* Currently we only support 'parallel in' -> 'csi out' */ vep = &tc358746->csi_vep; vep->bus_type = V4L2_MBUS_CSI2_DPHY; - err = v4l2_fwnode_endpoint_alloc_parse(ep, vep); + err = v4l2_fwnode_endpoint_alloc_parse(dev, ep, vep); fwnode_handle_put(ep); if (err) { dev_err(dev, "Failed to parse source endpoint\n"); @@ -1454,7 +1454,7 @@ static int tc358746_async_register(struct tc358746 *tc358746) if (!ep) return -ENOTCONN; - err = v4l2_fwnode_endpoint_parse(ep, &vep); + err = v4l2_fwnode_endpoint_parse(tc358746->sd.dev, ep, &vep); if (err) { fwnode_handle_put(ep); return err; diff --git a/drivers/media/i2c/tda1997x.c b/drivers/media/i2c/tda1997x.c index 325e99125941..a4d76ae3f7b2 100644 --- a/drivers/media/i2c/tda1997x.c +++ b/drivers/media/i2c/tda1997x.c @@ -2311,7 +2311,8 @@ static int tda1997x_parse_dt(struct tda1997x_state *state) if (!ep) return -EINVAL; - ret = v4l2_fwnode_endpoint_parse(of_fwnode_handle(ep), &bus_cfg); + ret = v4l2_fwnode_endpoint_parse(&state->client->dev, of_fwnode_handle(ep), + &bus_cfg); if (ret) { of_node_put(ep); return ret; diff --git a/drivers/media/i2c/tvp514x.c b/drivers/media/i2c/tvp514x.c index aa6d4b67b6d5..cae8091b8bf3 100644 --- a/drivers/media/i2c/tvp514x.c +++ b/drivers/media/i2c/tvp514x.c @@ -991,7 +991,8 @@ tvp514x_get_pdata(struct i2c_client *client) if (!endpoint) return NULL; - if (v4l2_fwnode_endpoint_parse(of_fwnode_handle(endpoint), &bus_cfg)) + if (v4l2_fwnode_endpoint_parse(&client->dev, of_fwnode_handle(endpoint), + &bus_cfg)) goto done; pdata = devm_kzalloc(&client->dev, sizeof(*pdata), GFP_KERNEL); diff --git a/drivers/media/i2c/tvp5150.c b/drivers/media/i2c/tvp5150.c index e543b3f7a4d8..f793eff9a99b 100644 --- a/drivers/media/i2c/tvp5150.c +++ b/drivers/media/i2c/tvp5150.c @@ -2080,7 +2080,7 @@ static int tvp5150_parse_dt(struct tvp5150 *decoder, struct device_node *np) dev_err(dev, "Error no output endpoint available\n"); goto err_free; } - ret = v4l2_fwnode_endpoint_parse(of_fwnode_handle(ep_np), &bus_cfg); + ret = v4l2_fwnode_endpoint_parse(dev, of_fwnode_handle(ep_np), &bus_cfg); of_node_put(ep_np); if (ret) goto err_free; diff --git a/drivers/media/i2c/tvp7002.c b/drivers/media/i2c/tvp7002.c index a2d7bc799849..8024ebe2d79e 100644 --- a/drivers/media/i2c/tvp7002.c +++ b/drivers/media/i2c/tvp7002.c @@ -897,7 +897,8 @@ tvp7002_get_pdata(struct i2c_client *client) if (!endpoint) return NULL; - if (v4l2_fwnode_endpoint_parse(of_fwnode_handle(endpoint), &bus_cfg)) + if (v4l2_fwnode_endpoint_parse(&client->dev, of_fwnode_handle(endpoint), + &bus_cfg)) goto done; pdata = devm_kzalloc(&client->dev, sizeof(*pdata), GFP_KERNEL); diff --git a/drivers/media/pci/intel/ipu3/ipu3-cio2.c b/drivers/media/pci/intel/ipu3/ipu3-cio2.c index 5dd69a251b6a..a685c9c29b9a 100644 --- a/drivers/media/pci/intel/ipu3/ipu3-cio2.c +++ b/drivers/media/pci/intel/ipu3/ipu3-cio2.c @@ -1477,7 +1477,7 @@ static int cio2_parse_firmware(struct cio2_device *cio2) if (!ep) continue; - ret = v4l2_fwnode_endpoint_parse(ep, &vep); + ret = v4l2_fwnode_endpoint_parse(dev, ep, &vep); if (ret) goto err_parse; diff --git a/drivers/media/pci/intel/ivsc/mei_csi.c b/drivers/media/pci/intel/ivsc/mei_csi.c index 2a6b828fd8dd..01d70f4be042 100644 --- a/drivers/media/pci/intel/ivsc/mei_csi.c +++ b/drivers/media/pci/intel/ivsc/mei_csi.c @@ -655,7 +655,7 @@ static int mei_csi_parse_firmware(struct mei_csi *csi) return -EINVAL; } - ret = v4l2_fwnode_endpoint_parse(ep, &v4l2_ep); + ret = v4l2_fwnode_endpoint_parse(dev, ep, &v4l2_ep); if (ret) { dev_err(dev, "could not parse v4l2 endpoint\n"); fwnode_handle_put(ep); @@ -675,7 +675,7 @@ static int mei_csi_parse_firmware(struct mei_csi *csi) return PTR_ERR(asd); } - ret = v4l2_fwnode_endpoint_alloc_parse(fwnode, &v4l2_ep); + ret = v4l2_fwnode_endpoint_alloc_parse(dev, fwnode, &v4l2_ep); fwnode_handle_put(fwnode); if (ret) return ret; diff --git a/drivers/media/platform/atmel/atmel-isi.c b/drivers/media/platform/atmel/atmel-isi.c index 4046212d48b4..09dd69b96c8f 100644 --- a/drivers/media/platform/atmel/atmel-isi.c +++ b/drivers/media/platform/atmel/atmel-isi.c @@ -837,7 +837,7 @@ static int atmel_isi_parse_dt(struct atmel_isi *isi, return -EINVAL; } - err = v4l2_fwnode_endpoint_parse(of_fwnode_handle(np), &ep); + err = v4l2_fwnode_endpoint_parse(&pdev->dev, of_fwnode_handle(np), &ep); of_node_put(np); if (err) { dev_err(&pdev->dev, "Could not parse the endpoint\n"); diff --git a/drivers/media/platform/cadence/cdns-csi2rx.c b/drivers/media/platform/cadence/cdns-csi2rx.c index 0d879d71d818..450b415ac76a 100644 --- a/drivers/media/platform/cadence/cdns-csi2rx.c +++ b/drivers/media/platform/cadence/cdns-csi2rx.c @@ -450,7 +450,7 @@ static int csi2rx_parse_dt(struct csi2rx_priv *csi2rx) return -EINVAL; fwh = of_fwnode_handle(ep); - ret = v4l2_fwnode_endpoint_parse(fwh, &v4l2_ep); + ret = v4l2_fwnode_endpoint_parse(csi2rx->dev, fwh, &v4l2_ep); if (ret) { dev_err(csi2rx->dev, "Could not parse v4l2 endpoint\n"); of_node_put(ep); diff --git a/drivers/media/platform/cadence/cdns-csi2tx.c b/drivers/media/platform/cadence/cdns-csi2tx.c index 1e0400b7803e..880f0e22702d 100644 --- a/drivers/media/platform/cadence/cdns-csi2tx.c +++ b/drivers/media/platform/cadence/cdns-csi2tx.c @@ -504,7 +504,8 @@ static int csi2tx_check_lanes(struct csi2tx_priv *csi2tx) if (!ep) return -EINVAL; - ret = v4l2_fwnode_endpoint_parse(of_fwnode_handle(ep), &v4l2_ep); + ret = v4l2_fwnode_endpoint_parse(csi2tx->dev, of_fwnode_handle(ep), + &v4l2_ep); if (ret) { dev_err(csi2tx->dev, "Could not parse v4l2 endpoint\n"); goto out; diff --git a/drivers/media/platform/intel/pxa_camera.c b/drivers/media/platform/intel/pxa_camera.c index 6e6caf50e11e..fcef0796a4bd 100644 --- a/drivers/media/platform/intel/pxa_camera.c +++ b/drivers/media/platform/intel/pxa_camera.c @@ -2213,7 +2213,7 @@ static int pxa_camera_pdata_from_dt(struct device *dev, return -EINVAL; } - err = v4l2_fwnode_endpoint_parse(of_fwnode_handle(np), &ep); + err = v4l2_fwnode_endpoint_parse(dev, of_fwnode_handle(np), &ep); if (err) { dev_err(dev, "could not parse endpoint\n"); goto out; diff --git a/drivers/media/platform/microchip/microchip-csi2dc.c b/drivers/media/platform/microchip/microchip-csi2dc.c index 988c1cc1d8b6..fd807440d7af 100644 --- a/drivers/media/platform/microchip/microchip-csi2dc.c +++ b/drivers/media/platform/microchip/microchip-csi2dc.c @@ -569,7 +569,8 @@ static int csi2dc_of_parse(struct csi2dc_device *csi2dc, return -EINVAL; } - ret = v4l2_fwnode_endpoint_parse(input_fwnode, &input_endpoint); + ret = v4l2_fwnode_endpoint_parse(csi2dc->dev, input_fwnode, + &input_endpoint); if (ret) { dev_err(csi2dc->dev, "endpoint not defined at %pOF\n", of_node); goto csi2dc_of_parse_err; @@ -595,7 +596,7 @@ static int csi2dc_of_parse(struct csi2dc_device *csi2dc, (of_fwnode_handle(of_node), input_fwnode); if (output_fwnode) - ret = v4l2_fwnode_endpoint_parse(output_fwnode, + ret = v4l2_fwnode_endpoint_parse(csi2dc->dev, output_fwnode, &output_endpoint); fwnode_handle_put(output_fwnode); diff --git a/drivers/media/platform/microchip/microchip-sama5d2-isc.c b/drivers/media/platform/microchip/microchip-sama5d2-isc.c index 5ac149cf3647..8e808c6971cb 100644 --- a/drivers/media/platform/microchip/microchip-sama5d2-isc.c +++ b/drivers/media/platform/microchip/microchip-sama5d2-isc.c @@ -367,7 +367,7 @@ static int isc_parse_dt(struct device *dev, struct isc_device *isc) if (!epn) return 0; - ret = v4l2_fwnode_endpoint_parse(of_fwnode_handle(epn), + ret = v4l2_fwnode_endpoint_parse(dev, of_fwnode_handle(epn), &v4l2_epn); if (ret) { ret = -EINVAL; diff --git a/drivers/media/platform/microchip/microchip-sama7g5-isc.c b/drivers/media/platform/microchip/microchip-sama7g5-isc.c index 73445f33d26b..700029926cb5 100644 --- a/drivers/media/platform/microchip/microchip-sama7g5-isc.c +++ b/drivers/media/platform/microchip/microchip-sama7g5-isc.c @@ -353,7 +353,7 @@ static int xisc_parse_dt(struct device *dev, struct isc_device *isc) if (!epn) return 0; - ret = v4l2_fwnode_endpoint_parse(of_fwnode_handle(epn), + ret = v4l2_fwnode_endpoint_parse(dev, of_fwnode_handle(epn), &v4l2_epn); if (ret) { ret = -EINVAL; diff --git a/drivers/media/platform/nxp/imx-mipi-csis.c b/drivers/media/platform/nxp/imx-mipi-csis.c index 5f93712bf485..2eb6c19969ec 100644 --- a/drivers/media/platform/nxp/imx-mipi-csis.c +++ b/drivers/media/platform/nxp/imx-mipi-csis.c @@ -1258,7 +1258,7 @@ static int mipi_csis_async_register(struct mipi_csis_device *csis) if (!ep) return -ENOTCONN; - ret = v4l2_fwnode_endpoint_parse(ep, &vep); + ret = v4l2_fwnode_endpoint_parse(csis->dev, ep, &vep); if (ret) goto err_parse; diff --git a/drivers/media/platform/nxp/imx8mq-mipi-csi2.c b/drivers/media/platform/nxp/imx8mq-mipi-csi2.c index ed048f73c982..b46a70e14be9 100644 --- a/drivers/media/platform/nxp/imx8mq-mipi-csi2.c +++ b/drivers/media/platform/nxp/imx8mq-mipi-csi2.c @@ -598,7 +598,7 @@ static int imx8mq_mipi_csi_async_register(struct csi_state *state) if (!ep) return -ENOTCONN; - ret = v4l2_fwnode_endpoint_parse(ep, &vep); + ret = v4l2_fwnode_endpoint_parse(state->dev, ep, &vep); if (ret) goto err_parse; diff --git a/drivers/media/platform/qcom/camss/camss.c b/drivers/media/platform/qcom/camss/camss.c index c6df862c79e3..e063b4787f89 100644 --- a/drivers/media/platform/qcom/camss/camss.c +++ b/drivers/media/platform/qcom/camss/camss.c @@ -1039,7 +1039,7 @@ static int camss_of_parse_endpoint_node(struct device *dev, struct v4l2_fwnode_endpoint vep = { { 0 } }; unsigned int i; - v4l2_fwnode_endpoint_parse(of_fwnode_handle(node), &vep); + v4l2_fwnode_endpoint_parse(dev, of_fwnode_handle(node), &vep); csd->interface.csiphy_id = vep.base.port; diff --git a/drivers/media/platform/renesas/rcar-vin/rcar-core.c b/drivers/media/platform/renesas/rcar-vin/rcar-core.c index 809c3a38cc4a..642ee6539de8 100644 --- a/drivers/media/platform/renesas/rcar-vin/rcar-core.c +++ b/drivers/media/platform/renesas/rcar-vin/rcar-core.c @@ -318,7 +318,7 @@ static int rvin_group_parse_of(struct rvin_dev *vin, unsigned int port, return 0; fwnode = fwnode_graph_get_remote_endpoint(ep); - ret = v4l2_fwnode_endpoint_parse(ep, &vep); + ret = v4l2_fwnode_endpoint_parse(vin->dev, ep, &vep); fwnode_handle_put(ep); if (ret) { vin_err(vin, "Failed to parse %pOF\n", to_of_node(fwnode)); @@ -663,7 +663,7 @@ static int rvin_parallel_parse_of(struct rvin_dev *vin) return 0; fwnode = fwnode_graph_get_remote_endpoint(ep); - ret = v4l2_fwnode_endpoint_parse(ep, &vep); + ret = v4l2_fwnode_endpoint_parse(vin->dev, ep, &vep); fwnode_handle_put(ep); if (ret) { vin_err(vin, "Failed to parse %pOF\n", to_of_node(fwnode)); diff --git a/drivers/media/platform/renesas/rcar-vin/rcar-csi2.c b/drivers/media/platform/renesas/rcar-vin/rcar-csi2.c index f6326df0b09b..39a27c694a60 100644 --- a/drivers/media/platform/renesas/rcar-vin/rcar-csi2.c +++ b/drivers/media/platform/renesas/rcar-vin/rcar-csi2.c @@ -1385,7 +1385,7 @@ static int rcsi2_parse_dt(struct rcar_csi2 *priv) return -EINVAL; } - ret = v4l2_fwnode_endpoint_parse(ep, &v4l2_ep); + ret = v4l2_fwnode_endpoint_parse(priv->dev, ep, &v4l2_ep); if (ret) { dev_err(priv->dev, "Could not parse v4l2 endpoint\n"); fwnode_handle_put(ep); diff --git a/drivers/media/platform/renesas/renesas-ceu.c b/drivers/media/platform/renesas/renesas-ceu.c index ec631c6e2a57..05527e468600 100644 --- a/drivers/media/platform/renesas/renesas-ceu.c +++ b/drivers/media/platform/renesas/renesas-ceu.c @@ -1558,7 +1558,8 @@ static int ceu_parse_dt(struct ceu_device *ceudev) goto error_cleanup; } - ret = v4l2_fwnode_endpoint_parse(of_fwnode_handle(ep), &fw_ep); + ret = v4l2_fwnode_endpoint_parse(ceudev->dev, + of_fwnode_handle(ep), &fw_ep); if (ret) { dev_err(ceudev->dev, "Unable to parse endpoint #%u: %d.\n", i, ret); diff --git a/drivers/media/platform/renesas/rzg2l-cru/rzg2l-core.c b/drivers/media/platform/renesas/rzg2l-cru/rzg2l-core.c index 280efd2a8185..f2df51b431c6 100644 --- a/drivers/media/platform/renesas/rzg2l-cru/rzg2l-core.c +++ b/drivers/media/platform/renesas/rzg2l-cru/rzg2l-core.c @@ -146,7 +146,7 @@ static int rzg2l_cru_mc_parse_of(struct rzg2l_cru_dev *cru) return 0; fwnode = fwnode_graph_get_remote_endpoint(ep); - ret = v4l2_fwnode_endpoint_parse(ep, &vep); + ret = v4l2_fwnode_endpoint_parse(cru->dev, ep, &vep); fwnode_handle_put(ep); if (ret) { dev_err(cru->dev, "Failed to parse %pOF\n", to_of_node(fwnode)); diff --git a/drivers/media/platform/renesas/rzg2l-cru/rzg2l-csi2.c b/drivers/media/platform/renesas/rzg2l-cru/rzg2l-csi2.c index ad2bd71037ab..7830684b441b 100644 --- a/drivers/media/platform/renesas/rzg2l-cru/rzg2l-csi2.c +++ b/drivers/media/platform/renesas/rzg2l-cru/rzg2l-csi2.c @@ -657,7 +657,7 @@ static int rzg2l_csi2_parse_dt(struct rzg2l_csi2 *csi2) return -EINVAL; } - ret = v4l2_fwnode_endpoint_parse(ep, &v4l2_ep); + ret = v4l2_fwnode_endpoint_parse(csi2->dev, ep, &v4l2_ep); if (ret) { dev_err(csi2->dev, "Could not parse v4l2 endpoint\n"); fwnode_handle_put(ep); diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c index c41abd2833f1..f2d63626694c 100644 --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c @@ -227,7 +227,7 @@ static int rkisp1_subdev_notifier_register(struct rkisp1_device *rkisp1) } /* Parse the endpoint and validate the bus type. */ - ret = v4l2_fwnode_endpoint_parse(ep, &vep); + ret = v4l2_fwnode_endpoint_parse(rkisp1->dev, ep, &vep); if (ret) { dev_err(rkisp1->dev, "failed to parse endpoint %pfw\n", ep); diff --git a/drivers/media/platform/samsung/exynos4-is/media-dev.c b/drivers/media/platform/samsung/exynos4-is/media-dev.c index 5f10bb4eb4f7..f3b1091ec625 100644 --- a/drivers/media/platform/samsung/exynos4-is/media-dev.c +++ b/drivers/media/platform/samsung/exynos4-is/media-dev.c @@ -404,7 +404,8 @@ static int fimc_md_parse_one_endpoint(struct fimc_md *fmd, struct v4l2_fwnode_endpoint endpoint = { .bus_type = 0 }; int ret; - ret = v4l2_fwnode_endpoint_parse(of_fwnode_handle(ep), &endpoint); + ret = v4l2_fwnode_endpoint_parse(&fmd->pdev->dev, of_fwnode_handle(ep), + &endpoint); if (ret) { of_node_put(ep); return ret; diff --git a/drivers/media/platform/samsung/exynos4-is/mipi-csis.c b/drivers/media/platform/samsung/exynos4-is/mipi-csis.c index 686ca8753ba2..3b9529dc8b13 100644 --- a/drivers/media/platform/samsung/exynos4-is/mipi-csis.c +++ b/drivers/media/platform/samsung/exynos4-is/mipi-csis.c @@ -735,7 +735,8 @@ static int s5pcsis_parse_dt(struct platform_device *pdev, return -EINVAL; } /* Get port node and validate MIPI-CSI channel id. */ - ret = v4l2_fwnode_endpoint_parse(of_fwnode_handle(node), &endpoint); + ret = v4l2_fwnode_endpoint_parse(&pdev->dev, of_fwnode_handle(node), + &endpoint); if (ret) goto err; diff --git a/drivers/media/platform/st/stm32/stm32-dcmi.c b/drivers/media/platform/st/stm32/stm32-dcmi.c index 8cb4fdcae137..fa4cc28622f8 100644 --- a/drivers/media/platform/st/stm32/stm32-dcmi.c +++ b/drivers/media/platform/st/stm32/stm32-dcmi.c @@ -1921,7 +1921,7 @@ static int dcmi_probe(struct platform_device *pdev) return -ENODEV; } - ret = v4l2_fwnode_endpoint_parse(of_fwnode_handle(np), &ep); + ret = v4l2_fwnode_endpoint_parse(&pdev->dev, of_fwnode_handle(np), &ep); of_node_put(np); if (ret) { dev_err(&pdev->dev, "Could not parse the endpoint\n"); diff --git a/drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.c b/drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.c index ad13d447d483..4c1e82b3ba27 100644 --- a/drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.c +++ b/drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.c @@ -128,7 +128,7 @@ static int sun4i_csi_notifier_init(struct sun4i_csi *csi) if (!ep) return -EINVAL; - ret = v4l2_fwnode_endpoint_parse(ep, &vep); + ret = v4l2_fwnode_endpoint_parse(csi->dev, ep, &vep); if (ret) goto out; diff --git a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.c b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.c index e573413123b9..24ebd760112f 100644 --- a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.c +++ b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.c @@ -720,7 +720,7 @@ static int sun6i_csi_bridge_source_setup(struct sun6i_csi_device *csi_dev, if (!handle) return -ENODEV; - ret = v4l2_fwnode_endpoint_parse(handle, endpoint); + ret = v4l2_fwnode_endpoint_parse(dev, handle, endpoint); if (ret) goto complete; diff --git a/drivers/media/platform/sunxi/sun6i-mipi-csi2/sun6i_mipi_csi2.c b/drivers/media/platform/sunxi/sun6i-mipi-csi2/sun6i_mipi_csi2.c index 08d86c17b284..712b1525115e 100644 --- a/drivers/media/platform/sunxi/sun6i-mipi-csi2/sun6i_mipi_csi2.c +++ b/drivers/media/platform/sunxi/sun6i-mipi-csi2/sun6i_mipi_csi2.c @@ -473,7 +473,7 @@ sun6i_mipi_csi2_bridge_source_setup(struct sun6i_mipi_csi2_device *csi2_dev) endpoint->bus_type = V4L2_MBUS_CSI2_DPHY; - ret = v4l2_fwnode_endpoint_parse(handle, endpoint); + ret = v4l2_fwnode_endpoint_parse(dev, handle, endpoint); if (ret) goto complete; diff --git a/drivers/media/platform/sunxi/sun8i-a83t-mipi-csi2/sun8i_a83t_mipi_csi2.c b/drivers/media/platform/sunxi/sun8i-a83t-mipi-csi2/sun8i_a83t_mipi_csi2.c index 14a1844812c0..e76f7371a82a 100644 --- a/drivers/media/platform/sunxi/sun8i-a83t-mipi-csi2/sun8i_a83t_mipi_csi2.c +++ b/drivers/media/platform/sunxi/sun8i-a83t-mipi-csi2/sun8i_a83t_mipi_csi2.c @@ -510,7 +510,7 @@ sun8i_a83t_mipi_csi2_bridge_source_setup(struct sun8i_a83t_mipi_csi2_device *csi endpoint->bus_type = V4L2_MBUS_CSI2_DPHY; - ret = v4l2_fwnode_endpoint_parse(handle, endpoint); + ret = v4l2_fwnode_endpoint_parse(dev, handle, endpoint); if (ret) goto complete; diff --git a/drivers/media/platform/ti/am437x/am437x-vpfe.c b/drivers/media/platform/ti/am437x/am437x-vpfe.c index 63092013d476..6ae54cce628d 100644 --- a/drivers/media/platform/ti/am437x/am437x-vpfe.c +++ b/drivers/media/platform/ti/am437x/am437x-vpfe.c @@ -2338,7 +2338,7 @@ vpfe_get_pdata(struct vpfe_device *vpfe) sdinfo->vpfe_param.if_type = VPFE_RAW_BAYER; } - err = v4l2_fwnode_endpoint_parse(of_fwnode_handle(endpoint), + err = v4l2_fwnode_endpoint_parse(dev, of_fwnode_handle(endpoint), &bus_cfg); if (err) { dev_err(dev, "Could not parse the endpoint\n"); diff --git a/drivers/media/platform/ti/cal/cal-camerarx.c b/drivers/media/platform/ti/cal/cal-camerarx.c index 1a4273bbe752..fc153d4cd338 100644 --- a/drivers/media/platform/ti/cal/cal-camerarx.c +++ b/drivers/media/platform/ti/cal/cal-camerarx.c @@ -545,7 +545,8 @@ static int cal_camerarx_parse_dt(struct cal_camerarx *phy) } endpoint->bus_type = V4L2_MBUS_CSI2_DPHY; - ret = v4l2_fwnode_endpoint_parse(of_fwnode_handle(ep_node), endpoint); + ret = v4l2_fwnode_endpoint_parse(phy->cal->dev, of_fwnode_handle(ep_node), + endpoint); if (ret < 0) { phy_err(phy, "Failed to parse endpoint\n"); goto done; diff --git a/drivers/media/platform/ti/davinci/vpif_capture.c b/drivers/media/platform/ti/davinci/vpif_capture.c index 99fae8830c41..5b93191d9d00 100644 --- a/drivers/media/platform/ti/davinci/vpif_capture.c +++ b/drivers/media/platform/ti/davinci/vpif_capture.c @@ -1547,7 +1547,8 @@ vpif_capture_get_pdata(struct platform_device *pdev, chan->inputs[i].input.std = V4L2_STD_ALL; chan->inputs[i].input.capabilities = V4L2_IN_CAP_STD; - err = v4l2_fwnode_endpoint_parse(of_fwnode_handle(endpoint), + err = v4l2_fwnode_endpoint_parse(&pdev->dev, + of_fwnode_handle(endpoint), &bus_cfg); if (err) { dev_err(&pdev->dev, "Could not parse the endpoint\n"); diff --git a/drivers/media/platform/ti/omap3isp/isp.c b/drivers/media/platform/ti/omap3isp/isp.c index 1cda23244c7b..04d14c117286 100644 --- a/drivers/media/platform/ti/omap3isp/isp.c +++ b/drivers/media/platform/ti/omap3isp/isp.c @@ -2164,7 +2164,7 @@ static int isp_parse_of_endpoints(struct isp_device *isp) dev_dbg(isp->dev, "parsing parallel interface\n"); - ret = v4l2_fwnode_endpoint_parse(ep, &vep); + ret = v4l2_fwnode_endpoint_parse(isp->dev, ep, &vep); if (!ret) { isd = v4l2_async_nf_add_fwnode_remote(&isp->notifier, @@ -2193,16 +2193,16 @@ static int isp_parse_of_endpoints(struct isp_device *isp) dev_dbg(isp->dev, "parsing serial interface %u, node %pOF\n", i, to_of_node(ep)); - ret = v4l2_fwnode_endpoint_parse(ep, &vep); + ret = v4l2_fwnode_endpoint_parse(isp->dev, ep, &vep); if (ret == -ENXIO) { vep = (struct v4l2_fwnode_endpoint) { .bus_type = V4L2_MBUS_CSI1 }; - ret = v4l2_fwnode_endpoint_parse(ep, &vep); + ret = v4l2_fwnode_endpoint_parse(isp->dev, ep, &vep); if (ret == -ENXIO) { vep = (struct v4l2_fwnode_endpoint) { .bus_type = V4L2_MBUS_CCP2 }; - ret = v4l2_fwnode_endpoint_parse(ep, &vep); + ret = v4l2_fwnode_endpoint_parse(isp->dev, ep, &vep); } } diff --git a/drivers/media/platform/xilinx/xilinx-csi2rxss.c b/drivers/media/platform/xilinx/xilinx-csi2rxss.c index 5b53745fe44e..5db655d9a6c2 100644 --- a/drivers/media/platform/xilinx/xilinx-csi2rxss.c +++ b/drivers/media/platform/xilinx/xilinx-csi2rxss.c @@ -923,7 +923,7 @@ static int xcsi2rxss_parse_of(struct xcsi2rxss_state *xcsi2rxss) return -EINVAL; } - ret = v4l2_fwnode_endpoint_parse(ep, &vep); + ret = v4l2_fwnode_endpoint_parse(dev, ep, &vep); fwnode_handle_put(ep); if (ret) { dev_err(dev, "error parsing sink port"); diff --git a/drivers/media/v4l2-core/v4l2-fwnode.c b/drivers/media/v4l2-core/v4l2-fwnode.c index 7f181fbbb140..99bac45f570b 100644 --- a/drivers/media/v4l2-core/v4l2-fwnode.c +++ b/drivers/media/v4l2-core/v4l2-fwnode.c @@ -493,7 +493,7 @@ static int __v4l2_fwnode_endpoint_parse(struct fwnode_handle *fwnode, return 0; } -int v4l2_fwnode_endpoint_parse(struct fwnode_handle *fwnode, +int v4l2_fwnode_endpoint_parse(struct device *dev, struct fwnode_handle *fwnode, struct v4l2_fwnode_endpoint *vep) { int ret; @@ -516,7 +516,8 @@ void v4l2_fwnode_endpoint_free(struct v4l2_fwnode_endpoint *vep) } EXPORT_SYMBOL_GPL(v4l2_fwnode_endpoint_free); -int v4l2_fwnode_endpoint_alloc_parse(struct fwnode_handle *fwnode, +int v4l2_fwnode_endpoint_alloc_parse(struct device *dev, + struct fwnode_handle *fwnode, struct v4l2_fwnode_endpoint *vep) { int rval; diff --git a/drivers/staging/media/atomisp/pci/atomisp_csi2_bridge.c b/drivers/staging/media/atomisp/pci/atomisp_csi2_bridge.c index 03940c11505f..191b99c82706 100644 --- a/drivers/staging/media/atomisp/pci/atomisp_csi2_bridge.c +++ b/drivers/staging/media/atomisp/pci/atomisp_csi2_bridge.c @@ -682,7 +682,7 @@ int atomisp_csi2_bridge_parse_firmware(struct atomisp_device *isp) if (!ep) continue; - ret = v4l2_fwnode_endpoint_parse(ep, &vep); + ret = v4l2_fwnode_endpoint_parse(isp->dev, ep, &vep); if (ret) goto err_parse; diff --git a/drivers/staging/media/deprecated/atmel/atmel-sama5d2-isc.c b/drivers/staging/media/deprecated/atmel/atmel-sama5d2-isc.c index 31b2b48085c5..3297167fecf9 100644 --- a/drivers/staging/media/deprecated/atmel/atmel-sama5d2-isc.c +++ b/drivers/staging/media/deprecated/atmel/atmel-sama5d2-isc.c @@ -347,7 +347,7 @@ static int isc_parse_dt(struct device *dev, struct isc_device *isc) if (!epn) return 0; - ret = v4l2_fwnode_endpoint_parse(of_fwnode_handle(epn), + ret = v4l2_fwnode_endpoint_parse(dev, of_fwnode_handle(epn), &v4l2_epn); if (ret) { ret = -EINVAL; diff --git a/drivers/staging/media/deprecated/atmel/atmel-sama7g5-isc.c b/drivers/staging/media/deprecated/atmel/atmel-sama7g5-isc.c index 020034f631f5..bbe166be0252 100644 --- a/drivers/staging/media/deprecated/atmel/atmel-sama7g5-isc.c +++ b/drivers/staging/media/deprecated/atmel/atmel-sama7g5-isc.c @@ -333,7 +333,7 @@ static int xisc_parse_dt(struct device *dev, struct isc_device *isc) if (!epn) return 0; - ret = v4l2_fwnode_endpoint_parse(of_fwnode_handle(epn), + ret = v4l2_fwnode_endpoint_parse(dev, of_fwnode_handle(epn), &v4l2_epn); if (ret) { ret = -EINVAL; diff --git a/drivers/staging/media/imx/imx6-mipi-csi2.c b/drivers/staging/media/imx/imx6-mipi-csi2.c index b2d8476d83a0..2e5eb6022f27 100644 --- a/drivers/staging/media/imx/imx6-mipi-csi2.c +++ b/drivers/staging/media/imx/imx6-mipi-csi2.c @@ -687,7 +687,7 @@ static int csi2_async_register(struct csi2_dev *csi2) if (!ep) return -ENOTCONN; - ret = v4l2_fwnode_endpoint_parse(ep, &vep); + ret = v4l2_fwnode_endpoint_parse(csi2->dev, ep, &vep); if (ret) goto err_parse; diff --git a/drivers/staging/media/max96712/max96712.c b/drivers/staging/media/max96712/max96712.c index c44145284aa1..8c1ec8f879a8 100644 --- a/drivers/staging/media/max96712/max96712.c +++ b/drivers/staging/media/max96712/max96712.c @@ -353,7 +353,7 @@ static int max96712_parse_dt(struct max96712_priv *priv) return -EINVAL; } - ret = v4l2_fwnode_endpoint_parse(ep, &v4l2_ep); + ret = v4l2_fwnode_endpoint_parse(&priv->client->dev, ep, &v4l2_ep); fwnode_handle_put(ep); if (ret) { dev_err(&priv->client->dev, "Could not parse v4l2 endpoint\n"); diff --git a/drivers/staging/media/sunxi/sun6i-isp/sun6i_isp_proc.c b/drivers/staging/media/sunxi/sun6i-isp/sun6i_isp_proc.c index ccbb530aa2e2..039fd54f5dbf 100644 --- a/drivers/staging/media/sunxi/sun6i-isp/sun6i_isp_proc.c +++ b/drivers/staging/media/sunxi/sun6i-isp/sun6i_isp_proc.c @@ -463,7 +463,7 @@ static int sun6i_isp_proc_source_setup(struct sun6i_isp_device *isp_dev, if (!handle) return -ENODEV; - ret = v4l2_fwnode_endpoint_parse(handle, endpoint); + ret = v4l2_fwnode_endpoint_parse(dev, handle, endpoint); if (ret) goto complete; diff --git a/drivers/staging/media/tegra-video/csi.c b/drivers/staging/media/tegra-video/csi.c index e79657920dc8..4b7a677bd57c 100644 --- a/drivers/staging/media/tegra-video/csi.c +++ b/drivers/staging/media/tegra-video/csi.c @@ -547,7 +547,7 @@ static int tegra_csi_channels_alloc(struct tegra_csi *csi) continue; fwh = of_fwnode_handle(ep); - ret = v4l2_fwnode_endpoint_parse(fwh, &v4l2_ep); + ret = v4l2_fwnode_endpoint_parse(csi->dev, fwh, &v4l2_ep); of_node_put(ep); if (ret) { dev_err(csi->dev, diff --git a/drivers/staging/media/tegra-video/vi.c b/drivers/staging/media/tegra-video/vi.c index e98b3010520e..9d0b9bf59ace 100644 --- a/drivers/staging/media/tegra-video/vi.c +++ b/drivers/staging/media/tegra-video/vi.c @@ -1289,7 +1289,7 @@ static int tegra_vi_channels_alloc(struct tegra_vi *vi) ep = of_graph_get_endpoint_by_regs(parent, 0, 0); of_node_put(parent); - ret = v4l2_fwnode_endpoint_parse(of_fwnode_handle(ep), + ret = v4l2_fwnode_endpoint_parse(vi->dev, of_fwnode_handle(ep), &v4l2_ep); of_node_put(ep); if (ret) diff --git a/drivers/staging/media/tegra-video/vip.c b/drivers/staging/media/tegra-video/vip.c index 191ecd19a6a7..c9a81ed949ee 100644 --- a/drivers/staging/media/tegra-video/vip.c +++ b/drivers/staging/media/tegra-video/vip.c @@ -130,7 +130,7 @@ static int tegra_vip_channel_of_parse(struct tegra_vip *vip) } fwh = of_fwnode_handle(ep); - err = v4l2_fwnode_endpoint_parse(fwh, &v4l2_ep); + err = v4l2_fwnode_endpoint_parse(dev, fwh, &v4l2_ep); of_node_put(ep); if (err) { dev_err_probe(dev, err, "%pOF: failed to parse v4l2 endpoint\n", np); diff --git a/include/media/v4l2-fwnode.h b/include/media/v4l2-fwnode.h index f7c57c776589..8a3028475269 100644 --- a/include/media/v4l2-fwnode.h +++ b/include/media/v4l2-fwnode.h @@ -182,6 +182,7 @@ enum v4l2_fwnode_bus_type { /** * v4l2_fwnode_endpoint_parse() - parse all fwnode node properties + * @dev: the device parsing the endpoint * @fwnode: pointer to the endpoint's fwnode handle * @vep: pointer to the V4L2 fwnode data structure * @@ -212,6 +213,8 @@ enum v4l2_fwnode_bus_type { * * The function does not change the V4L2 fwnode endpoint state if it fails. * + * The @dev argument is used to provide context in kernel log message. + * * NOTE: This function does not parse "link-frequencies" property as its size is * not known in advance. Please use v4l2_fwnode_endpoint_alloc_parse() if you * need properties of variable size. @@ -221,7 +224,8 @@ enum v4l2_fwnode_bus_type { * %-EINVAL on parsing failure * %-ENXIO on mismatching bus types */ -int v4l2_fwnode_endpoint_parse(struct fwnode_handle *fwnode, +int v4l2_fwnode_endpoint_parse(struct device *dev, + struct fwnode_handle *fwnode, struct v4l2_fwnode_endpoint *vep); /** @@ -236,6 +240,7 @@ void v4l2_fwnode_endpoint_free(struct v4l2_fwnode_endpoint *vep); /** * v4l2_fwnode_endpoint_alloc_parse() - parse all fwnode node properties + * @dev: the device parsing the endpoint * @fwnode: pointer to the endpoint's fwnode handle * @vep: pointer to the V4L2 fwnode data structure * @@ -266,6 +271,8 @@ void v4l2_fwnode_endpoint_free(struct v4l2_fwnode_endpoint *vep); * * The function does not change the V4L2 fwnode endpoint state if it fails. * + * The @dev argument is used to provide context in kernel log message. + * * v4l2_fwnode_endpoint_alloc_parse() has two important differences to * v4l2_fwnode_endpoint_parse(): * @@ -279,7 +286,8 @@ void v4l2_fwnode_endpoint_free(struct v4l2_fwnode_endpoint *vep); * %-EINVAL on parsing failure * %-ENXIO on mismatching bus types */ -int v4l2_fwnode_endpoint_alloc_parse(struct fwnode_handle *fwnode, +int v4l2_fwnode_endpoint_alloc_parse(struct device *dev, + struct fwnode_handle *fwnode, struct v4l2_fwnode_endpoint *vep); /** From patchwork Thu Sep 14 18:44:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 13385842 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 41418EEAA5D for ; Thu, 14 Sep 2023 18:50:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241745AbjINSup (ORCPT ); Thu, 14 Sep 2023 14:50:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43024 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239351AbjINSuf (ORCPT ); Thu, 14 Sep 2023 14:50:35 -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 BDA4D30EF for ; Thu, 14 Sep 2023 11:44:25 -0700 (PDT) Received: from pendragon.ideasonboard.com (213-243-189-158.bb.dnainternet.fi [213.243.189.158]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id B8E2815EF; Thu, 14 Sep 2023 20:42:51 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1694716972; bh=PNEErvkWvlkXjAVCf9SA4nyBaKQq5kRdJwuxp9SBjCk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IoNWlODEIJ4FmP60etHJedM7dafxumWWJVdsTtvH5sivWtVVSaNHzmrAcUDIZLSZ5 OqVHRfiAnCmcClVKxtm5ojVWvLS95zfje3FcL3w4rTWoDxgaedIcj3ZJAMfCpr9kBN Br9pf08OkbtM7yxUMSLT7IENC5np3Ph84zg01bCs= From: Laurent Pinchart To: linux-media@vger.kernel.org Cc: Sakari Ailus , Hans Verkuil Subject: [PATCH v2 2/2] media: v4l2-fwnode: Replace pr_*() with dev_*() Date: Thu, 14 Sep 2023 21:44:35 +0300 Message-ID: <20230914184435.7807-3-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230914184435.7807-1-laurent.pinchart@ideasonboard.com> References: <20230914184435.7807-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org v4l2-fwnode prints a large number of debug and warning messages without linking them to a device context. Use the device pointer available to the functions to replace the pr_*() calls with dev_*() in order to indicate better which device the messages relate to. Signed-off-by: Laurent Pinchart --- drivers/media/v4l2-core/v4l2-fwnode.c | 121 ++++++++++++++------------ 1 file changed, 63 insertions(+), 58 deletions(-) diff --git a/drivers/media/v4l2-core/v4l2-fwnode.c b/drivers/media/v4l2-core/v4l2-fwnode.c index 99bac45f570b..e747099bc07b 100644 --- a/drivers/media/v4l2-core/v4l2-fwnode.c +++ b/drivers/media/v4l2-core/v4l2-fwnode.c @@ -121,7 +121,8 @@ v4l2_fwnode_mbus_type_to_string(enum v4l2_mbus_type type) return conv ? conv->name : "not found"; } -static int v4l2_fwnode_endpoint_parse_csi2_bus(struct fwnode_handle *fwnode, +static int v4l2_fwnode_endpoint_parse_csi2_bus(struct device *dev, + struct fwnode_handle *fwnode, struct v4l2_fwnode_endpoint *vep, enum v4l2_mbus_type bus_type) { @@ -155,7 +156,7 @@ static int v4l2_fwnode_endpoint_parse_csi2_bus(struct fwnode_handle *fwnode, } if (use_default_lane_mapping) - pr_debug("no lane mapping given, using defaults\n"); + dev_dbg(dev, "no lane mapping given, using defaults\n"); } rval = fwnode_property_count_u32(fwnode, "data-lanes"); @@ -168,7 +169,7 @@ static int v4l2_fwnode_endpoint_parse_csi2_bus(struct fwnode_handle *fwnode, have_data_lanes = true; if (use_default_lane_mapping) { - pr_debug("data-lanes property exists; disabling default mapping\n"); + dev_dbg(dev, "data-lanes property exists; disabling default mapping\n"); use_default_lane_mapping = false; } } @@ -176,21 +177,21 @@ static int v4l2_fwnode_endpoint_parse_csi2_bus(struct fwnode_handle *fwnode, for (i = 0; i < num_data_lanes; i++) { if (lanes_used & BIT(array[i])) { if (have_data_lanes || !use_default_lane_mapping) - pr_warn("duplicated lane %u in data-lanes, using defaults\n", - array[i]); + dev_warn(dev, "duplicated lane %u in data-lanes, using defaults\n", + array[i]); use_default_lane_mapping = true; } lanes_used |= BIT(array[i]); if (have_data_lanes) - pr_debug("lane %u position %u\n", i, array[i]); + dev_dbg(dev, "lane %u position %u\n", i, array[i]); } rval = fwnode_property_count_u32(fwnode, "lane-polarities"); if (rval > 0) { if (rval != 1 + num_data_lanes /* clock+data */) { - pr_warn("invalid number of lane-polarities entries (need %u, got %u)\n", - 1 + num_data_lanes, rval); + dev_warn(dev, "invalid number of lane-polarities entries (need %u, got %u)\n", + 1 + num_data_lanes, rval); return -EINVAL; } @@ -199,20 +200,20 @@ static int v4l2_fwnode_endpoint_parse_csi2_bus(struct fwnode_handle *fwnode, if (!fwnode_property_read_u32(fwnode, "clock-lanes", &v)) { clock_lane = v; - pr_debug("clock lane position %u\n", v); + dev_dbg(dev, "clock lane position %u\n", v); have_clk_lane = true; } if (have_clk_lane && lanes_used & BIT(clock_lane) && !use_default_lane_mapping) { - pr_warn("duplicated lane %u in clock-lanes, using defaults\n", - v); + dev_warn(dev, "duplicated lane %u in clock-lanes, using defaults\n", + v); use_default_lane_mapping = true; } if (fwnode_property_present(fwnode, "clock-noncontinuous")) { flags |= V4L2_MBUS_CSI2_NONCONTINUOUS_CLOCK; - pr_debug("non-continuous clock\n"); + dev_dbg(dev, "non-continuous clock\n"); } if (bus_type == V4L2_MBUS_CSI2_DPHY || @@ -244,11 +245,11 @@ static int v4l2_fwnode_endpoint_parse_csi2_bus(struct fwnode_handle *fwnode, for (i = 0; i < 1 + num_data_lanes; i++) { bus->lane_polarities[i] = array[i]; - pr_debug("lane %u polarity %sinverted", - i, array[i] ? "" : "not "); + dev_dbg(dev, "lane %u polarity %sinverted", + i, array[i] ? "" : "not "); } } else { - pr_debug("no lane polarities defined, assuming not inverted\n"); + dev_dbg(dev, "no lane polarities defined, assuming not inverted\n"); } } @@ -263,7 +264,8 @@ static int v4l2_fwnode_endpoint_parse_csi2_bus(struct fwnode_handle *fwnode, V4L2_MBUS_FIELD_EVEN_LOW) static void -v4l2_fwnode_endpoint_parse_parallel_bus(struct fwnode_handle *fwnode, +v4l2_fwnode_endpoint_parse_parallel_bus(struct device *dev, + struct fwnode_handle *fwnode, struct v4l2_fwnode_endpoint *vep, enum v4l2_mbus_type bus_type) { @@ -279,7 +281,7 @@ v4l2_fwnode_endpoint_parse_parallel_bus(struct fwnode_handle *fwnode, V4L2_MBUS_HSYNC_ACTIVE_LOW); flags |= v ? V4L2_MBUS_HSYNC_ACTIVE_HIGH : V4L2_MBUS_HSYNC_ACTIVE_LOW; - pr_debug("hsync-active %s\n", v ? "high" : "low"); + dev_dbg(dev, "hsync-active %s\n", v ? "high" : "low"); } if (!fwnode_property_read_u32(fwnode, "vsync-active", &v)) { @@ -287,7 +289,7 @@ v4l2_fwnode_endpoint_parse_parallel_bus(struct fwnode_handle *fwnode, V4L2_MBUS_VSYNC_ACTIVE_LOW); flags |= v ? V4L2_MBUS_VSYNC_ACTIVE_HIGH : V4L2_MBUS_VSYNC_ACTIVE_LOW; - pr_debug("vsync-active %s\n", v ? "high" : "low"); + dev_dbg(dev, "vsync-active %s\n", v ? "high" : "low"); } if (!fwnode_property_read_u32(fwnode, "field-even-active", &v)) { @@ -295,7 +297,7 @@ v4l2_fwnode_endpoint_parse_parallel_bus(struct fwnode_handle *fwnode, V4L2_MBUS_FIELD_EVEN_LOW); flags |= v ? V4L2_MBUS_FIELD_EVEN_HIGH : V4L2_MBUS_FIELD_EVEN_LOW; - pr_debug("field-even-active %s\n", v ? "high" : "low"); + dev_dbg(dev, "field-even-active %s\n", v ? "high" : "low"); } if (!fwnode_property_read_u32(fwnode, "pclk-sample", &v)) { @@ -305,18 +307,18 @@ v4l2_fwnode_endpoint_parse_parallel_bus(struct fwnode_handle *fwnode, switch (v) { case 0: flags |= V4L2_MBUS_PCLK_SAMPLE_FALLING; - pr_debug("pclk-sample low\n"); + dev_dbg(dev, "pclk-sample low\n"); break; case 1: flags |= V4L2_MBUS_PCLK_SAMPLE_RISING; - pr_debug("pclk-sample high\n"); + dev_dbg(dev, "pclk-sample high\n"); break; case 2: flags |= V4L2_MBUS_PCLK_SAMPLE_DUALEDGE; - pr_debug("pclk-sample dual edge\n"); + dev_dbg(dev, "pclk-sample dual edge\n"); break; default: - pr_warn("invalid argument for pclk-sample"); + dev_warn(dev, "invalid argument for pclk-sample"); break; } } @@ -326,11 +328,11 @@ v4l2_fwnode_endpoint_parse_parallel_bus(struct fwnode_handle *fwnode, V4L2_MBUS_DATA_ACTIVE_LOW); flags |= v ? V4L2_MBUS_DATA_ACTIVE_HIGH : V4L2_MBUS_DATA_ACTIVE_LOW; - pr_debug("data-active %s\n", v ? "high" : "low"); + dev_dbg(dev, "data-active %s\n", v ? "high" : "low"); } if (fwnode_property_present(fwnode, "slave-mode")) { - pr_debug("slave mode\n"); + dev_dbg(dev, "slave mode\n"); flags &= ~V4L2_MBUS_MASTER; flags |= V4L2_MBUS_SLAVE; } else { @@ -340,12 +342,12 @@ v4l2_fwnode_endpoint_parse_parallel_bus(struct fwnode_handle *fwnode, if (!fwnode_property_read_u32(fwnode, "bus-width", &v)) { bus->bus_width = v; - pr_debug("bus-width %u\n", v); + dev_dbg(dev, "bus-width %u\n", v); } if (!fwnode_property_read_u32(fwnode, "data-shift", &v)) { bus->data_shift = v; - pr_debug("data-shift %u\n", v); + dev_dbg(dev, "data-shift %u\n", v); } if (!fwnode_property_read_u32(fwnode, "sync-on-green-active", &v)) { @@ -353,7 +355,7 @@ v4l2_fwnode_endpoint_parse_parallel_bus(struct fwnode_handle *fwnode, V4L2_MBUS_VIDEO_SOG_ACTIVE_LOW); flags |= v ? V4L2_MBUS_VIDEO_SOG_ACTIVE_HIGH : V4L2_MBUS_VIDEO_SOG_ACTIVE_LOW; - pr_debug("sync-on-green-active %s\n", v ? "high" : "low"); + dev_dbg(dev, "sync-on-green-active %s\n", v ? "high" : "low"); } if (!fwnode_property_read_u32(fwnode, "data-enable-active", &v)) { @@ -361,7 +363,7 @@ v4l2_fwnode_endpoint_parse_parallel_bus(struct fwnode_handle *fwnode, V4L2_MBUS_DATA_ENABLE_LOW); flags |= v ? V4L2_MBUS_DATA_ENABLE_HIGH : V4L2_MBUS_DATA_ENABLE_LOW; - pr_debug("data-enable-active %s\n", v ? "high" : "low"); + dev_dbg(dev, "data-enable-active %s\n", v ? "high" : "low"); } switch (bus_type) { @@ -384,7 +386,8 @@ v4l2_fwnode_endpoint_parse_parallel_bus(struct fwnode_handle *fwnode, } static void -v4l2_fwnode_endpoint_parse_csi1_bus(struct fwnode_handle *fwnode, +v4l2_fwnode_endpoint_parse_csi1_bus(struct device *dev, + struct fwnode_handle *fwnode, struct v4l2_fwnode_endpoint *vep, enum v4l2_mbus_type bus_type) { @@ -393,22 +396,22 @@ v4l2_fwnode_endpoint_parse_csi1_bus(struct fwnode_handle *fwnode, if (!fwnode_property_read_u32(fwnode, "clock-inv", &v)) { bus->clock_inv = v; - pr_debug("clock-inv %u\n", v); + dev_dbg(dev, "clock-inv %u\n", v); } if (!fwnode_property_read_u32(fwnode, "strobe", &v)) { bus->strobe = v; - pr_debug("strobe %u\n", v); + dev_dbg(dev, "strobe %u\n", v); } if (!fwnode_property_read_u32(fwnode, "data-lanes", &v)) { bus->data_lane = v; - pr_debug("data-lanes %u\n", v); + dev_dbg(dev, "data-lanes %u\n", v); } if (!fwnode_property_read_u32(fwnode, "clock-lanes", &v)) { bus->clock_lane = v; - pr_debug("clock-lanes %u\n", v); + dev_dbg(dev, "clock-lanes %u\n", v); } if (bus_type == V4L2_MBUS_CCP2) @@ -417,31 +420,32 @@ v4l2_fwnode_endpoint_parse_csi1_bus(struct fwnode_handle *fwnode, vep->bus_type = V4L2_MBUS_CSI1; } -static int __v4l2_fwnode_endpoint_parse(struct fwnode_handle *fwnode, +static int __v4l2_fwnode_endpoint_parse(struct device *dev, + struct fwnode_handle *fwnode, struct v4l2_fwnode_endpoint *vep) { u32 bus_type = V4L2_FWNODE_BUS_TYPE_GUESS; enum v4l2_mbus_type mbus_type; int rval; - pr_debug("===== begin parsing endpoint %pfw\n", fwnode); + dev_dbg(dev, "===== begin parsing endpoint %pfw\n", fwnode); fwnode_property_read_u32(fwnode, "bus-type", &bus_type); - pr_debug("fwnode video bus type %s (%u), mbus type %s (%u)\n", - v4l2_fwnode_bus_type_to_string(bus_type), bus_type, - v4l2_fwnode_mbus_type_to_string(vep->bus_type), - vep->bus_type); + dev_dbg(dev, "fwnode video bus type %s (%u), mbus type %s (%u)\n", + v4l2_fwnode_bus_type_to_string(bus_type), bus_type, + v4l2_fwnode_mbus_type_to_string(vep->bus_type), + vep->bus_type); mbus_type = v4l2_fwnode_bus_type_to_mbus(bus_type); if (mbus_type == V4L2_MBUS_INVALID) { - pr_debug("unsupported bus type %u\n", bus_type); + dev_dbg(dev, "unsupported bus type %u\n", bus_type); return -EINVAL; } if (vep->bus_type != V4L2_MBUS_UNKNOWN) { if (mbus_type != V4L2_MBUS_UNKNOWN && vep->bus_type != mbus_type) { - pr_debug("expecting bus type %s\n", - v4l2_fwnode_mbus_type_to_string(vep->bus_type)); + dev_dbg(dev, "expecting bus type %s\n", + v4l2_fwnode_mbus_type_to_string(vep->bus_type)); return -ENXIO; } } else { @@ -450,28 +454,29 @@ static int __v4l2_fwnode_endpoint_parse(struct fwnode_handle *fwnode, switch (vep->bus_type) { case V4L2_MBUS_UNKNOWN: - rval = v4l2_fwnode_endpoint_parse_csi2_bus(fwnode, vep, + rval = v4l2_fwnode_endpoint_parse_csi2_bus(dev, fwnode, vep, V4L2_MBUS_UNKNOWN); if (rval) return rval; if (vep->bus_type == V4L2_MBUS_UNKNOWN) - v4l2_fwnode_endpoint_parse_parallel_bus(fwnode, vep, + v4l2_fwnode_endpoint_parse_parallel_bus(dev, fwnode, vep, V4L2_MBUS_UNKNOWN); - pr_debug("assuming media bus type %s (%u)\n", - v4l2_fwnode_mbus_type_to_string(vep->bus_type), - vep->bus_type); + dev_dbg(dev, "assuming media bus type %s (%u)\n", + v4l2_fwnode_mbus_type_to_string(vep->bus_type), + vep->bus_type); break; case V4L2_MBUS_CCP2: case V4L2_MBUS_CSI1: - v4l2_fwnode_endpoint_parse_csi1_bus(fwnode, vep, vep->bus_type); + v4l2_fwnode_endpoint_parse_csi1_bus(dev, fwnode, vep, + vep->bus_type); break; case V4L2_MBUS_CSI2_DPHY: case V4L2_MBUS_CSI2_CPHY: - rval = v4l2_fwnode_endpoint_parse_csi2_bus(fwnode, vep, + rval = v4l2_fwnode_endpoint_parse_csi2_bus(dev, fwnode, vep, vep->bus_type); if (rval) return rval; @@ -479,12 +484,12 @@ static int __v4l2_fwnode_endpoint_parse(struct fwnode_handle *fwnode, break; case V4L2_MBUS_PARALLEL: case V4L2_MBUS_BT656: - v4l2_fwnode_endpoint_parse_parallel_bus(fwnode, vep, + v4l2_fwnode_endpoint_parse_parallel_bus(dev, fwnode, vep, vep->bus_type); break; default: - pr_warn("unsupported bus type %u\n", mbus_type); + dev_warn(dev, "unsupported bus type %u\n", mbus_type); return -EINVAL; } @@ -498,9 +503,9 @@ int v4l2_fwnode_endpoint_parse(struct device *dev, struct fwnode_handle *fwnode, { int ret; - ret = __v4l2_fwnode_endpoint_parse(fwnode, vep); + ret = __v4l2_fwnode_endpoint_parse(dev, fwnode, vep); - pr_debug("===== end parsing endpoint %pfw\n", fwnode); + dev_dbg(dev, "===== end parsing endpoint %pfw\n", fwnode); return ret; } @@ -522,7 +527,7 @@ int v4l2_fwnode_endpoint_alloc_parse(struct device *dev, { int rval; - rval = __v4l2_fwnode_endpoint_parse(fwnode, vep); + rval = __v4l2_fwnode_endpoint_parse(dev, fwnode, vep); if (rval < 0) return rval; @@ -548,11 +553,11 @@ int v4l2_fwnode_endpoint_alloc_parse(struct device *dev, } for (i = 0; i < vep->nr_of_link_frequencies; i++) - pr_debug("link-frequencies %u value %llu\n", i, - vep->link_frequencies[i]); + dev_dbg(dev, "link-frequencies %u value %llu\n", i, + vep->link_frequencies[i]); } - pr_debug("===== end parsing endpoint %pfw\n", fwnode); + dev_dbg(dev, "===== end parsing endpoint %pfw\n", fwnode); return 0; }