From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 87B24CD5BA3 for ; Tue, 19 May 2026 10:39:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References :Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=xJoUF1IkVlOZYxAgNMP8prmYYcvN97zlEjbFr/2f2Tw=; b=AHMsiFc4dDkN1rZiLkKRijaNPL D9gqk0V8HQ8Hmeb3HlonRvLiaLjKkry8XVT+f6BUYQaUqbUrw4mqKDbaR4G6mltVuXGGZYDE4UF2R V4/OWKLKiEYRdahxt78fuGVNuizbOYc2zOR8ITqUwCGz0+Ich39FjSvrKGFkRCPRlyUkud7pATug/ fYTk4l0ypvvu7I5ru6R3NW2RoBc9AdmcAChB+yRKxj4ZnMDDHkcbvS+mD/ZMI3aFyACC4t2QGenWx 38bw5Jd1MJH5caWiNVUI60wojIW1l8wU7DU/9wMqpYwf8nyU2bybgVvhgiFRxR2K7HjfuyWLfZTjC t4t8kzcA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1wPHqk-000000017nc-0LTW; Tue, 19 May 2026 10:38:58 +0000 Received: from smtpout-04.galae.net ([185.171.202.116]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1wPHqU-000000017TI-33si for linux-arm-kernel@lists.infradead.org; Tue, 19 May 2026 10:38:44 +0000 Received: from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233]) by smtpout-04.galae.net (Postfix) with ESMTPS id 3AB3BC2B9DB; Tue, 19 May 2026 10:39:34 +0000 (UTC) Received: from mail.galae.net (mail.galae.net [212.83.136.155]) by smtpout-01.galae.net (Postfix) with ESMTPS id 10C99606E9; Tue, 19 May 2026 10:38:41 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 531A1107E8ACA; Tue, 19 May 2026 12:38:35 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=dkim; t=1779187119; h=from:subject:date:message-id:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=xJoUF1IkVlOZYxAgNMP8prmYYcvN97zlEjbFr/2f2Tw=; b=wSuFZS48WrOXLF1huzOWOX2I009n21Dn2TUZBOGSogCD1S3yJcBB7sX1OzRf5EP4P3Q1b/ snTJI+Bi89+upN0esGvmQGFUXecJSHazcA/Qbh8fnRISaLtDJh8pb3OpE0sIrSUpoIO2Xe 4UVfgSdPts/m87SP6W7FqSJYGHrRYDaOG8okESkiUJmX6qEzOPv0pKNIfh1ZG2ZzSqlNpP IKrZ6PbXCo9tZYepuhNOonx3wTle+mXEkdYDyBBpkWcpT2T+3wNzaJ9Sm+I7D+QT51IuUA Xfr4RUg9ZnLdXDG82zE4NNUH5TnjKNxbRvhnij6B+bBpWuyM9/Lk/0FvQWMmGw== From: Luca Ceresoli Date: Tue, 19 May 2026 12:37:25 +0200 Subject: [PATCH 08/37] drm/display: bridge-connector: return int from drm_bridge_connector_get_bridges() MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260519-drm-bridge-hotplug-v1-8-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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260519_033843_728986_64C405B6 X-CRM114-Status: GOOD ( 13.67 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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 | 61 +++++++++++++------------- 1 file changed, 30 insertions(+), 31 deletions(-) diff --git a/drivers/gpu/drm/display/drm_bridge_connector.c b/drivers/gpu/drm/display/drm_bridge_connector.c index 97d9a4c6d166..d8a033ed8f41 100644 --- a/drivers/gpu/drm/display/drm_bridge_connector.c +++ b/drivers/gpu/drm/display/drm_bridge_connector.c @@ -772,14 +772,13 @@ static void drm_bridge_connector_put_bridges(struct drm_device *dev, void *data) drm_bridge_put(bridge_connector->bridge_hdmi_cec); } -static struct drm_bridge_connector * -drm_bridge_connector_get_bridges(struct drm_bridge_connector *bridge_connector, - int *connector_type, - unsigned int *supported_formats, - unsigned int *max_bpc, - struct i2c_adapter **ddc, - struct drm_bridge **panel_bridge, - bool *support_hdcp) +static int drm_bridge_connector_get_bridges(struct drm_bridge_connector *bridge_connector, + int *connector_type, + unsigned int *supported_formats, + unsigned int *max_bpc, + struct i2c_adapter **ddc, + struct drm_bridge **panel_bridge, + bool *support_hdcp) { struct drm_connector *connector = &bridge_connector->base; @@ -820,27 +819,27 @@ drm_bridge_connector_get_bridges(struct drm_bridge_connector *bridge_connector, } if (bridge->ops & DRM_BRIDGE_OP_HDMI) { if (bridge_connector->bridge_hdmi) - return ERR_PTR(-EBUSY); + return -EBUSY; if (!bridge->funcs->hdmi_write_avi_infoframe || !bridge->funcs->hdmi_clear_avi_infoframe || !bridge->funcs->hdmi_write_hdmi_infoframe || !bridge->funcs->hdmi_clear_hdmi_infoframe) - return ERR_PTR(-EINVAL); + return -EINVAL; if (bridge->ops & DRM_BRIDGE_OP_HDMI_AUDIO && (!bridge->funcs->hdmi_write_audio_infoframe || !bridge->funcs->hdmi_clear_audio_infoframe)) - return ERR_PTR(-EINVAL); + return -EINVAL; if (bridge->ops & DRM_BRIDGE_OP_HDMI_HDR_DRM_INFOFRAME && (!bridge->funcs->hdmi_write_hdr_drm_infoframe || !bridge->funcs->hdmi_clear_hdr_drm_infoframe)) - return ERR_PTR(-EINVAL); + return -EINVAL; if (bridge->ops & DRM_BRIDGE_OP_HDMI_SPD_INFOFRAME && (!bridge->funcs->hdmi_write_spd_infoframe || !bridge->funcs->hdmi_clear_spd_infoframe)) - return ERR_PTR(-EINVAL); + return -EINVAL; bridge_connector->bridge_hdmi = drm_bridge_get(bridge); @@ -852,57 +851,57 @@ drm_bridge_connector_get_bridges(struct drm_bridge_connector *bridge_connector, if (bridge->ops & DRM_BRIDGE_OP_HDMI_AUDIO) { if (bridge_connector->bridge_hdmi_audio) - return ERR_PTR(-EBUSY); + return -EBUSY; if (bridge_connector->bridge_dp_audio) - return ERR_PTR(-EBUSY); + return -EBUSY; if (!bridge->hdmi_audio_max_i2s_playback_channels && !bridge->hdmi_audio_spdif_playback) - return ERR_PTR(-EINVAL); + return -EINVAL; if (!bridge->funcs->hdmi_audio_prepare || !bridge->funcs->hdmi_audio_shutdown) - return ERR_PTR(-EINVAL); + return -EINVAL; bridge_connector->bridge_hdmi_audio = drm_bridge_get(bridge); } if (bridge->ops & DRM_BRIDGE_OP_DP_AUDIO) { if (bridge_connector->bridge_dp_audio) - return ERR_PTR(-EBUSY); + return -EBUSY; if (bridge_connector->bridge_hdmi_audio) - return ERR_PTR(-EBUSY); + return -EBUSY; if (!bridge->hdmi_audio_max_i2s_playback_channels && !bridge->hdmi_audio_spdif_playback) - return ERR_PTR(-EINVAL); + return -EINVAL; if (!bridge->funcs->dp_audio_prepare || !bridge->funcs->dp_audio_shutdown) - return ERR_PTR(-EINVAL); + return -EINVAL; bridge_connector->bridge_dp_audio = drm_bridge_get(bridge); } if (bridge->ops & DRM_BRIDGE_OP_HDMI_CEC_NOTIFIER) { if (bridge_connector->bridge_hdmi_cec) - return ERR_PTR(-EBUSY); + return -EBUSY; bridge_connector->bridge_hdmi_cec = drm_bridge_get(bridge); } if (bridge->ops & DRM_BRIDGE_OP_HDMI_CEC_ADAPTER) { if (bridge_connector->bridge_hdmi_cec) - return ERR_PTR(-EBUSY); + return -EBUSY; bridge_connector->bridge_hdmi_cec = drm_bridge_get(bridge); if (!bridge->funcs->hdmi_cec_enable || !bridge->funcs->hdmi_cec_log_addr || !bridge->funcs->hdmi_cec_transmit) - return ERR_PTR(-EINVAL); + return -EINVAL; } if (drm_bridge_is_last(bridge)) @@ -926,9 +925,9 @@ drm_bridge_connector_get_bridges(struct drm_bridge_connector *bridge_connector, } if (connector_type == DRM_MODE_CONNECTOR_Unknown) - return ERR_PTR(-EINVAL); + return -EINVAL; - return bridge_connector; + return 0; } /** @@ -956,11 +955,11 @@ drm_bridge_connector_add_connector(struct drm_bridge_connector *bridge_connector connector = &bridge_connector->base; - bridge_connector = drm_bridge_connector_get_bridges(bridge_connector, &connector_type, - &supported_formats, &max_bpc, &ddc, - &panel_bridge, &support_hdcp); - if (IS_ERR(bridge_connector)) - return bridge_connector; + ret = drm_bridge_connector_get_bridges(bridge_connector, &connector_type, + &supported_formats, &max_bpc, &ddc, + &panel_bridge, &support_hdcp); + if (ret) + return ERR_PTR(ret); if (bridge_connector->bridge_hdmi) { if (!connector->ycbcr_420_allowed) -- 2.54.0