Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Feedback-ID: i8771445c:Fastmail
From:   Maxime Ripard <maxime@cerno.tech>
To:     Maxime Ripard <mripard@kernel.org>,
        Ben Skeggs <bskeggs@redhat.com>,
        David Airlie <airlied@linux.ie>, Chen-Yu Tsai <wens@csie.org>,
        Thomas Zimmermann <tzimmermann@suse.de>,
        Jani Nikula <jani.nikula@linux.intel.com>,
        Lyude Paul <lyude@redhat.com>,
        Philipp Zabel <p.zabel@pengutronix.de>,
        Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
        Rodrigo Vivi <rodrigo.vivi@intel.com>,
        Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>,
        Jernej Skrabec <jernej.skrabec@gmail.com>,
        Samuel Holland <samuel@sholland.org>,
        Karol Herbst <kherbst@redhat.com>,
        =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= <noralf@tronnes.org>,
        Emma Anholt <emma@anholt.net>, Daniel Vetter <daniel@ffwll.ch>,
        Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc:     Maxime Ripard <maxime@cerno.tech>,
        Hans de Goede <hdegoede@redhat.com>,
        linux-arm-kernel@lists.infradead.org,
        Phil Elwell <phil@raspberrypi.com>,
        intel-gfx@lists.freedesktop.org,
        Dave Stevenson <dave.stevenson@raspberrypi.com>,
        dri-devel@lists.freedesktop.org, Dom Cobley <dom@raspberrypi.com>,
        linux-kernel@vger.kernel.org, nouveau@lists.freedesktop.org,
        linux-sunxi@lists.linux.dev,
        Mateusz Kwiatkowski <kfyatek+publicgit@gmail.com>,
        Geert Uytterhoeven <geert@linux-m68k.org>
Subject: [PATCH v2 04/41] drm/connector: Rename subconnector state variable
Date:   Mon, 29 Aug 2022 15:11:18 +0200
Message-Id: <20220728-rpi-analog-tv-properties-v2-4-459522d653a7@cerno.tech>
In-Reply-To: <20220728-rpi-analog-tv-properties-v2-0-459522d653a7@cerno.tech>
References: <20220728-rpi-analog-tv-properties-v2-0-459522d653a7@cerno.tech>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

There is two TV subconnector related properties registered by=0D
drm_mode_create_tv_properties(): subconnector and select subconnector.=0D
=0D
While the select subconnector property is stored in the kernel by the=0D
drm_tv_connector_state structure, the subconnector property isn't stored=0D
anywhere.=0D
=0D
Worse, the select subconnector property is stored in a field called=0D
subconnector, creating some ambiguity about which property content we're=0D
accessing.=0D
=0D
Let's rename that field to one called select_subconnector to make it move=0D
obvious what it's about.=0D
=0D
Signed-off-by: Maxime Ripard <maxime@cerno.tech>=0D
Reviewed-by: Noralf Tr=C3=B8nnes <noralf@tronnes.org>=0D
=0D
diff --git a/drivers/gpu/drm/drm_atomic_uapi.c b/drivers/gpu/drm/drm_atomic=
_uapi.c=0D
index 79730fa1dd8e..c74c78a28171 100644=0D
--- a/drivers/gpu/drm/drm_atomic_uapi.c=0D
+++ b/drivers/gpu/drm/drm_atomic_uapi.c=0D
@@ -687,7 +687,7 @@ static int drm_atomic_connector_set_property(struct drm=
_connector *connector,=0D
 		 */=0D
 		return -EINVAL;=0D
 	} else if (property =3D=3D config->tv_select_subconnector_property) {=0D
-		state->tv.subconnector =3D val;=0D
+		state->tv.select_subconnector =3D val;=0D
 	} else if (property =3D=3D config->tv_left_margin_property) {=0D
 		state->tv.margins.left =3D val;=0D
 	} else if (property =3D=3D config->tv_right_margin_property) {=0D
@@ -795,7 +795,7 @@ drm_atomic_connector_get_property(struct drm_connector =
*connector,=0D
 		else=0D
 			*val =3D connector->dpms;=0D
 	} else if (property =3D=3D config->tv_select_subconnector_property) {=0D
-		*val =3D state->tv.subconnector;=0D
+		*val =3D state->tv.select_subconnector;=0D
 	} else if (property =3D=3D config->tv_left_margin_property) {=0D
 		*val =3D state->tv.margins.left;=0D
 	} else if (property =3D=3D config->tv_right_margin_property) {=0D
diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h=0D
index 23112f0c11cf..60b5662dec7c 100644=0D
--- a/include/drm/drm_connector.h=0D
+++ b/include/drm/drm_connector.h=0D
@@ -703,7 +703,7 @@ struct drm_connector_tv_margins {=0D
  * @hue: hue in percent=0D
  */=0D
 struct drm_tv_connector_state {=0D
-	enum drm_mode_subconnector subconnector;=0D
+	enum drm_mode_subconnector select_subconnector;=0D
 	struct drm_connector_tv_margins margins;=0D
 	unsigned int mode;=0D
 	unsigned int brightness;=0D
=0D
-- =0D
b4 0.10.0-dev-65ba7=0D