On Fri, 28 Feb 2025, Ville Syrjala <ville.syrjala@xxxxxxxxxxxxxxx> wrote:
> From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
>
> Rename the 'new_crtc' variable to just 'crtc' in
> drm_client_firmware_config(). We don't call any of the other
> stuff in here new or old so this feels out of place.
>
> v2: Rebase
>
> Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
Reviewed-by: Jani Nikula <jani.nikula@xxxxxxxxx>
> ---
> drivers/gpu/drm/drm_client_modeset.c | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_client_modeset.c b/drivers/gpu/drm/drm_client_modeset.c
> index 4c64535fb82c..a0caa2b229dd 100644
> --- a/drivers/gpu/drm/drm_client_modeset.c
> +++ b/drivers/gpu/drm/drm_client_modeset.c
> @@ -658,7 +658,7 @@ static bool drm_client_firmware_config(struct drm_client_dev *client,
> for (i = 0; i < count; i++) {
> struct drm_connector *connector;
> struct drm_encoder *encoder;
> - struct drm_crtc *new_crtc;
> + struct drm_crtc *crtc;
> const char *mode_type;
>
> connector = connectors[i];
> @@ -700,7 +700,7 @@ static bool drm_client_firmware_config(struct drm_client_dev *client,
>
> num_connectors_enabled++;
>
> - new_crtc = connector->state->crtc;
> + crtc = connector->state->crtc;
>
> /*
> * Make sure we're not trying to drive multiple connectors
> @@ -708,7 +708,7 @@ static bool drm_client_firmware_config(struct drm_client_dev *client,
> * match the BIOS.
> */
> for (j = 0; j < count; j++) {
> - if (crtcs[j] == new_crtc) {
> + if (crtcs[j] == crtc) {
> drm_dbg_kms(dev, "[CONNECTOR:%d:%s] fallback: cloned configuration\n",
> connector->base.id, connector->name);
> goto bail;
> @@ -735,7 +735,7 @@ static bool drm_client_firmware_config(struct drm_client_dev *client,
> if (!modes[i]) {
> mode_type = "current";
> mode_replace(dev, &modes[i],
> - &new_crtc->state->mode);
> + &crtc->state->mode);
> }
>
> /*
> @@ -748,11 +748,11 @@ static bool drm_client_firmware_config(struct drm_client_dev *client,
> mode_replace(dev, &modes[i],
> drm_connector_fallback_non_tiled_mode(connector));
> }
> - crtcs[i] = new_crtc;
> + crtcs[i] = crtc;
>
> drm_dbg_kms(dev, "[CONNECTOR::%d:%s] on [CRTC:%d:%s] using %s mode: %s\n",
> connector->base.id, connector->name,
> - new_crtc->base.id, new_crtc->name,
> + crtc->base.id, crtc->name,
> mode_type, modes[i]->name);
>
> fallback = false;
--
Jani Nikula, Intel
