From 61ee87fc5a7911c47b4d93876abbe21fdc877e1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C3=ADra=20Canal?= Date: Wed, 30 Apr 2025 18:36:38 -0300 Subject: [PATCH] drm/v3d: Don't retrieve the clock twice MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Upstream commit d3976b4e3830 ("drm/v3d: Add clock handling") introduced clock handling. Therefore, delete the clock handling previously introduced in downstream. Signed-off-by: Maíra Canal --- drivers/gpu/drm/v3d/v3d_drv.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/drivers/gpu/drm/v3d/v3d_drv.c b/drivers/gpu/drm/v3d/v3d_drv.c index 40a2c5ddf243d5..b3b24eeb2bc68a 100644 --- a/drivers/gpu/drm/v3d/v3d_drv.c +++ b/drivers/gpu/drm/v3d/v3d_drv.c @@ -395,21 +395,18 @@ static int v3d_platform_drm_probe(struct platform_device *pdev) } } - v3d->clk = devm_clk_get(dev, NULL); - if (IS_ERR_OR_NULL(v3d->clk)) { - if (PTR_ERR(v3d->clk) != -EPROBE_DEFER) - dev_err(dev, "Failed to get clock (%ld)\n", PTR_ERR(v3d->clk)); - return PTR_ERR(v3d->clk); - } - node = rpi_firmware_find_node(); - if (!node) - return -EINVAL; + if (!node) { + ret = -EINVAL; + goto clk_disable; + } firmware = rpi_firmware_get(node); of_node_put(node); - if (!firmware) - return -EPROBE_DEFER; + if (!firmware) { + ret = -EPROBE_DEFER; + goto clk_disable; + } v3d->clk_up_rate = rpi_firmware_clk_get_max_rate(firmware, RPI_FIRMWARE_V3D_CLK_ID);