From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtpout-04.galae.net (smtpout-04.galae.net [185.171.202.116]) (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 71C2D3A4510 for ; Tue, 19 May 2026 10:38:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.171.202.116 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779187136; cv=none; b=hNGtHvfNapVj333n9EPsKZcegNdj6z8XuiM0drk6DGYpSbxTbk6sGoZIiOSkHlfLYmPk//niYVRzo/+PsYQeRPJFpwSxZEgVGvIdxZuqKO4d95GCaw6xRFlhwoXIVz5oaxldKJRqeJ0W82vjIs3wIY4vQP7uhU4lpEBM+M6faL8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779187136; c=relaxed/simple; bh=uLCGBPmwcAyR7Yedf8D/a/H5VJXzL0BHZ57OTPC5iHE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=snXOvxZDNpKU4b3O2ECP9280PXLaqs14Mz+mTtRTb7TXfQLf526wyALOfvWayZvfxGvFwFjgQXtHF2jWCM6smR8iGWlCBnbZLXCp98EH8jUi8cVAKgbJsAdv8hUZrImutPjoexzgAHkQXJUhuVtBovKh3qcD4v+C3JEItJZXF+0= 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=hVK9PFdC; arc=none smtp.client-ip=185.171.202.116 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="hVK9PFdC" Received: from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233]) by smtpout-04.galae.net (Postfix) with ESMTPS id 77A41C2B9DB; Tue, 19 May 2026 10:39:46 +0000 (UTC) Received: from mail.galae.net (mail.galae.net [212.83.136.155]) by smtpout-01.galae.net (Postfix) with ESMTPS id 4C791606E9; Tue, 19 May 2026 10:38:53 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 08D0B107E8AD3; Tue, 19 May 2026 12:38:47 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=dkim; t=1779187131; h=from:subject:date:message-id:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=f8PX3xqkM3heELg2F4nk1n3EZygfl3IAuY8PxbEGuV8=; b=hVK9PFdCFanPiC++87SKl4nRw4HidvStVJOu7ExZ13QI0X1ADjMwDSo5cskAGsbtTTuD5f x5vdeQb0pA9gzASKtJIO1aF+bdcgw9JHF0aUWz/iYFMg2RK0uvJei1tk1gMUo8+VceDpOw jKf8FeZTIHUTY/R3TRwSe1C5EBmZlOPq5AryjSrXfoB1Pm+nO+lH0EknflBYVBoLEvgkzb qheTh7C8sYPnbu6d3KvjGxYM3Gb3m9Up8DRNmVpcwf72nHtCaukRsT/p0C0Hk2TNsPIQ62 9UslQ35QoYXaQImhYCIldCD1bUwZkM9G3y1pUU0+bOG1Fxbgg9CScMFTUmhNUg== From: Luca Ceresoli Date: Tue, 19 May 2026 12:37:28 +0200 Subject: [PATCH 11/37] drm/display: bridge-connector: return int from drm_bridge_connector_add_connector() 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-11-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: it can only return either the same pointer it received as input or a negative ERR_PTR. This forces users to an unnecessarily complex error management code. Clean up error management by just returning an int (0 or negative error). Signed-off-by: Luca Ceresoli --- drivers/gpu/drm/display/drm_bridge_connector.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/drivers/gpu/drm/display/drm_bridge_connector.c b/drivers/gpu/drm/display/drm_bridge_connector.c index 6066ca0c5624..982bc64d8361 100644 --- a/drivers/gpu/drm/display/drm_bridge_connector.c +++ b/drivers/gpu/drm/display/drm_bridge_connector.c @@ -991,11 +991,9 @@ static int drm_bridge_connector_init_hdmi_audio_cec(struct drm_bridge_connector * @bridge_connector->drm and @bridge_connector->encoder fields are * assigned at least) * - * Returns a pointer to @bridge_connector on success, or a negative error - * pointer otherwise. + * Returns 0 on success or a negative error otherwise. */ -static struct drm_bridge_connector * -drm_bridge_connector_add_connector(struct drm_bridge_connector *bridge_connector) +static int drm_bridge_connector_add_connector(struct drm_bridge_connector *bridge_connector) { struct drm_connector *connector; struct i2c_adapter *ddc = NULL; @@ -1012,7 +1010,7 @@ drm_bridge_connector_add_connector(struct drm_bridge_connector *bridge_connector &supported_formats, &max_bpc, &ddc, &panel_bridge, &support_hdcp); if (ret) - return ERR_PTR(ret); + return ret; if (bridge_connector->bridge_hdmi) { if (!connector->ycbcr_420_allowed) @@ -1041,18 +1039,18 @@ drm_bridge_connector_add_connector(struct drm_bridge_connector *bridge_connector supported_formats, max_bpc); if (ret) - return ERR_PTR(ret); + return ret; } else { ret = drmm_connector_init(bridge_connector->drm, connector, &drm_bridge_connector_funcs, connector_type, ddc); if (ret) - return ERR_PTR(ret); + return ret; } ret = drm_bridge_connector_init_hdmi_audio_cec(bridge_connector); if (ret) - return ERR_PTR(ret); + return ret; drm_connector_helper_add(connector, &drm_bridge_connector_helper_funcs); @@ -1071,9 +1069,9 @@ drm_bridge_connector_add_connector(struct drm_bridge_connector *bridge_connector ret = drm_connector_attach_encoder(connector, bridge_connector->encoder); if (ret) - return ERR_PTR(ret); + return ret; - return bridge_connector; + return 0; } /** @@ -1110,9 +1108,9 @@ struct drm_connector *drm_bridge_connector_init(struct drm_device *drm, bridge_connector->drm = drm; bridge_connector->encoder = encoder; - bridge_connector = drm_bridge_connector_add_connector(bridge_connector); - if (IS_ERR(bridge_connector)) - return ERR_CAST(bridge_connector); + ret = drm_bridge_connector_add_connector(bridge_connector); + if (ret) + return ERR_PTR(ret); return &bridge_connector->base; } -- 2.54.0