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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (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 DD024D41D64 for ; Thu, 11 Dec 2025 16:40:17 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 40E4F10E85A; Thu, 11 Dec 2025 16:40:17 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=bootlin.com header.i=@bootlin.com header.b="p5UAjbe5"; dkim-atps=neutral Received: from smtpout-02.galae.net (smtpout-02.galae.net [185.246.84.56]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9EE6110E854 for ; Thu, 11 Dec 2025 16:40:15 +0000 (UTC) Received: from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233]) by smtpout-02.galae.net (Postfix) with ESMTPS id 8D5751A20D8; Thu, 11 Dec 2025 16:40:14 +0000 (UTC) Received: from mail.galae.net (mail.galae.net [212.83.136.155]) by smtpout-01.galae.net (Postfix) with ESMTPS id 60EBA6073E; Thu, 11 Dec 2025 16:40:14 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 410F5103C8E13; Thu, 11 Dec 2025 17:40:10 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=dkim; t=1765471212; h=from:subject:date:message-id:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=A0GyQRxuBWvyoYl427NSnbll0gqIE2jfGrZTzQnmr+A=; b=p5UAjbe5eR1vlgo9bmW8zner3UPyTwDeeNvcucEgqfGYRme/IJofxW6w7iW/aC+t/ck176 pbyQXfSRHzZEd8nsCB5GKPIVDrhSphnFxvOpIbzdjONZSlLfIIetGlkxIqICimEeS320GA czRJSC0S9iojtVNey8/BiR6E0qRIHXpha3rPo4pRjTE3/FjocI2GfW49p/AnXYyeTIV2gh l44XlcPtXhw6qPy/HTcCY5DPYXcp6bhmVgyv3MDSZpvl0V+QN1jOEcFLG7U02ALC7sxAHU SLMQJWwHpbSBsXF5gqpwiqTGDTvSBPnMs50OmMcOfICio+CKeb8HAr0TEPocnQ== From: "Kory Maincent (TI.com)" Date: Thu, 11 Dec 2025 17:38:55 +0100 Subject: [PATCH v2 11/20] drm/tilcdc: Rename external_encoder and external_connector to encoder and connector MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20251211-feature_tilcdc-v2-11-f48bac3cd33e@bootlin.com> References: <20251211-feature_tilcdc-v2-0-f48bac3cd33e@bootlin.com> In-Reply-To: <20251211-feature_tilcdc-v2-0-f48bac3cd33e@bootlin.com> To: Jyri Sarha , Tomi Valkeinen , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Russell King , Bartosz Golaszewski , Tony Lindgren , Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec Cc: Markus Schneider-Pargmann , Bajjuri Praneeth , Luca Ceresoli , Louis Chauvet , Thomas Petazzoni , Miguel Gazquez , dri-devel@lists.freedesktop.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org, "Kory Maincent (TI.com)" X-Mailer: b4 0.14.3 X-Last-TLS-Session-Version: TLSv1.3 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Remove the "external_" prefix from encoder and connector members in the tilcdc driver. These are internal driver structures and the "external" naming is misleading. The simpler names better reflect that these are the primary encoder and connector managed by this driver. Also rename tilcdc_attach_external_device() to tilcdc_encoder_create() for consistency and to better describe the function's purpose. Signed-off-by: Kory Maincent (TI.com) --- drivers/gpu/drm/tilcdc/tilcdc_drv.c | 4 ++-- drivers/gpu/drm/tilcdc/tilcdc_drv.h | 4 ++-- drivers/gpu/drm/tilcdc/tilcdc_external.c | 24 ++++++++++++------------ drivers/gpu/drm/tilcdc/tilcdc_external.h | 2 +- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/drivers/gpu/drm/tilcdc/tilcdc_drv.c b/drivers/gpu/drm/tilcdc/tilcdc_drv.c index a753cc47a59d7..bf6cd763ecd0f 100644 --- a/drivers/gpu/drm/tilcdc/tilcdc_drv.c +++ b/drivers/gpu/drm/tilcdc/tilcdc_drv.c @@ -344,11 +344,11 @@ static int tilcdc_init(const struct drm_driver *ddrv, struct device *dev) } #endif - ret = tilcdc_attach_external_device(ddev); + ret = tilcdc_encoder_create(ddev); if (ret) goto unregister_cpufreq_notif; - if (!priv->external_connector) { + if (!priv->connector) { dev_err(dev, "no encoders/connectors found\n"); ret = -EPROBE_DEFER; goto unregister_cpufreq_notif; diff --git a/drivers/gpu/drm/tilcdc/tilcdc_drv.h b/drivers/gpu/drm/tilcdc/tilcdc_drv.h index 717529a331009..dafb00908d1d4 100644 --- a/drivers/gpu/drm/tilcdc/tilcdc_drv.h +++ b/drivers/gpu/drm/tilcdc/tilcdc_drv.h @@ -75,8 +75,8 @@ struct tilcdc_drm_private { struct drm_crtc *crtc; - struct drm_encoder *external_encoder; - struct drm_connector *external_connector; + struct drm_encoder *encoder; + struct drm_connector *connector; bool irq_enabled; }; diff --git a/drivers/gpu/drm/tilcdc/tilcdc_external.c b/drivers/gpu/drm/tilcdc/tilcdc_external.c index 81c90c2754c6c..0c18d05dc7101 100644 --- a/drivers/gpu/drm/tilcdc/tilcdc_external.c +++ b/drivers/gpu/drm/tilcdc/tilcdc_external.c @@ -37,21 +37,21 @@ int tilcdc_attach_bridge(struct drm_device *ddev, struct drm_bridge *bridge) struct tilcdc_drm_private *priv = ddev->dev_private; int ret; - priv->external_encoder->possible_crtcs = BIT(0); + priv->encoder->possible_crtcs = BIT(0); - ret = drm_bridge_attach(priv->external_encoder, bridge, NULL, 0); + ret = drm_bridge_attach(priv->encoder, bridge, NULL, 0); if (ret) return ret; - priv->external_connector = - tilcdc_encoder_find_connector(ddev, priv->external_encoder); - if (!priv->external_connector) + priv->connector = + tilcdc_encoder_find_connector(ddev, priv->encoder); + if (!priv->connector) return -ENODEV; return 0; } -int tilcdc_attach_external_device(struct drm_device *ddev) +int tilcdc_encoder_create(struct drm_device *ddev) { struct tilcdc_drm_private *priv = ddev->dev_private; struct drm_bridge *bridge; @@ -65,13 +65,13 @@ int tilcdc_attach_external_device(struct drm_device *ddev) else if (ret) return ret; - priv->external_encoder = devm_kzalloc(ddev->dev, - sizeof(*priv->external_encoder), - GFP_KERNEL); - if (!priv->external_encoder) + priv->encoder = devm_kzalloc(ddev->dev, + sizeof(*priv->encoder), + GFP_KERNEL); + if (!priv->encoder) return -ENOMEM; - ret = drm_simple_encoder_init(ddev, priv->external_encoder, + ret = drm_simple_encoder_init(ddev, priv->encoder, DRM_MODE_ENCODER_NONE); if (ret) { dev_err(ddev->dev, "drm_encoder_init() failed %d\n", ret); @@ -94,6 +94,6 @@ int tilcdc_attach_external_device(struct drm_device *ddev) return 0; err_encoder_cleanup: - drm_encoder_cleanup(priv->external_encoder); + drm_encoder_cleanup(priv->encoder); return ret; } diff --git a/drivers/gpu/drm/tilcdc/tilcdc_external.h b/drivers/gpu/drm/tilcdc/tilcdc_external.h index 285a132f3035d..c8f87f59024e6 100644 --- a/drivers/gpu/drm/tilcdc/tilcdc_external.h +++ b/drivers/gpu/drm/tilcdc/tilcdc_external.h @@ -7,5 +7,5 @@ #ifndef __TILCDC_EXTERNAL_H__ #define __TILCDC_EXTERNAL_H__ -int tilcdc_attach_external_device(struct drm_device *ddev); +int tilcdc_encoder_create(struct drm_device *ddev); #endif /* __TILCDC_SLAVE_H__ */ -- 2.43.0