From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtpout-02.galae.net (smtpout-02.galae.net [185.246.84.56]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9495C370AFE for ; Tue, 19 May 2026 10:38:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.246.84.56 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779187132; cv=none; b=WM3QeTsZDkvrMbFlbF2jbqzwSSFncE/e9PnzIiNey+eLpte4AYW/Ow12omhb7Sn5bFiukRj/a9SgDl4RukDTwoiPxC6+nxz/vzZA2hTq/xmBlBOg0ChgQN9EnqKDjWpXVSc06ZukJRTgbX1tOBnQTEJmA3xi0Tm0ecPDYFgDuDM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779187132; c=relaxed/simple; bh=0N5vk3VKv5pJ8jFY+t+uy4qJ/0erV8oEQXerqdUUkLI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=nESoaE0R/H0q6bXHCyZFvtohhtEZUsPN8ZX2ll4EQissMxZTBrhgHk0L2ZC6w0TiwDlW3Rs5AWyF8gY8U69wuc13zZ0dxEIV9aVIYgJmnFGA3DUvHTiP0AHokoG4RhI0QnA4rkYn2xifa46R1RHhwpAAXXvkRmsARQZxNY7X/xI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com; spf=pass smtp.mailfrom=bootlin.com; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b=mN29/H1d; arc=none smtp.client-ip=185.246.84.56 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bootlin.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="mN29/H1d" Received: from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233]) by smtpout-02.galae.net (Postfix) with ESMTPS id 601881A3628; Tue, 19 May 2026 10:38:49 +0000 (UTC) Received: from mail.galae.net (mail.galae.net [212.83.136.155]) by smtpout-01.galae.net (Postfix) with ESMTPS id 33FF4606E9; Tue, 19 May 2026 10:38:49 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 14C5C107E8AC3; Tue, 19 May 2026 12:38:43 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=dkim; t=1779187127; h=from:subject:date:message-id:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=Di2t9C3Wga7u13endyDgbNt60je3EfQ2HxxTrMzvD30=; b=mN29/H1dlWQgyTgztrhOqG93sBuV28HHJ43/F+Zd/4GyUw6vHmmtlBG693qH6KjfCe9QYw OES8DUkhvsB+hi5YAUAP1XxlLr34ku+aUezCyP5G97iFnOddGtOuUhFf3SYDIw7Ndc0z1/ lMquoJcTfROUqySTdyM3vAT/xD3WR5FKIgrx9ikqzPk004e7B66XSWxbmnS+lsCFZfkYCK hE8YhL0fFd485kmIbQ5Zb84nAJohjSJJgUeDg2XckAl7HIJFMmwUWr4VPUxB5oWE+ZqF1U dr8cwuM4Y52/4ZEwWkki9n4TAgU4O6OWJSuLEGz6/EYbLRdEFlfNJDJCb2oWPg== From: Luca Ceresoli Date: Tue, 19 May 2026 12:37:27 +0200 Subject: [PATCH 10/37] drm/display: bridge-connector: return int from drm_bridge_connector_init_hdmi_audio_cec() Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260519-drm-bridge-hotplug-v1-10-45e2bdb3dfb4@bootlin.com> References: <20260519-drm-bridge-hotplug-v1-0-45e2bdb3dfb4@bootlin.com> In-Reply-To: <20260519-drm-bridge-hotplug-v1-0-45e2bdb3dfb4@bootlin.com> To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , Inki Dae , Jagan Teki , Marek Szyprowski , Marek Vasut , Stefan Agner , Frank Li , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam Cc: Hui Pu , Ian Ray , Thomas Petazzoni , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, Luca Ceresoli X-Mailer: b4 0.15.2 X-Last-TLS-Session-Version: TLSv1.3 This function returns a struct drm_bridge_connector * because this was the case in the origin of its code. In current code it does not make sense anymore: it can only return either the same pointer it received as input or a negative ERR_PTR. Simplify up error management by just returning an int (0 or negative error). No functional changes. Signed-off-by: Luca Ceresoli --- drivers/gpu/drm/display/drm_bridge_connector.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/display/drm_bridge_connector.c b/drivers/gpu/drm/display/drm_bridge_connector.c index e6306e98a167..6066ca0c5624 100644 --- a/drivers/gpu/drm/display/drm_bridge_connector.c +++ b/drivers/gpu/drm/display/drm_bridge_connector.c @@ -930,8 +930,7 @@ static int drm_bridge_connector_get_bridges(struct drm_bridge_connector *bridge_ return 0; } -static struct drm_bridge_connector * -drm_bridge_connector_init_hdmi_audio_cec(struct drm_bridge_connector *bridge_connector) +static int drm_bridge_connector_init_hdmi_audio_cec(struct drm_bridge_connector *bridge_connector) { int ret; @@ -954,7 +953,7 @@ drm_bridge_connector_init_hdmi_audio_cec(struct drm_bridge_connector *bridge_con bridge->hdmi_audio_spdif_playback, bridge->hdmi_audio_dai_port); if (ret) - return ERR_PTR(ret); + return ret; } if (bridge_connector->bridge_hdmi_cec && @@ -965,7 +964,7 @@ drm_bridge_connector_init_hdmi_audio_cec(struct drm_bridge_connector *bridge_con NULL, bridge->hdmi_cec_dev); if (ret) - return ERR_PTR(ret); + return ret; } if (bridge_connector->bridge_hdmi_cec && @@ -978,10 +977,10 @@ drm_bridge_connector_init_hdmi_audio_cec(struct drm_bridge_connector *bridge_con bridge->hdmi_cec_available_las, bridge->hdmi_cec_dev); if (ret) - return ERR_PTR(ret); + return ret; } - return bridge_connector; + return 0; } /** @@ -1051,9 +1050,9 @@ drm_bridge_connector_add_connector(struct drm_bridge_connector *bridge_connector return ERR_PTR(ret); } - bridge_connector = drm_bridge_connector_init_hdmi_audio_cec(bridge_connector); - if (IS_ERR(bridge_connector)) - return bridge_connector; + ret = drm_bridge_connector_init_hdmi_audio_cec(bridge_connector); + if (ret) + return ERR_PTR(ret); drm_connector_helper_add(connector, &drm_bridge_connector_helper_funcs); -- 2.54.0