From: Ville Syrjälä <ville.syrj...@linux.intel.com>
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.syrj...@linux.intel.com>
---
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 0f3418cb59ab..d0ed7a8effbe 100644
--- a/drivers/gpu/drm/drm_client_modeset.c
+++ b/drivers/gpu/drm/drm_client_modeset.c
@@ -649,7 +649,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];
@@ -691,7 +691,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
@@ -699,7 +699,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;
@@ -726,7 +726,7 @@ static bool drm_client_firmware_config(struct
drm_client_dev *client,
if (!mode_valid(&modes[i])) {
mode_type = "current";
mode_copy_if_not_null(&modes[i],
- &new_crtc->state->mode);
+ &crtc->state->mode);
}
/*
@@ -739,11 +739,11 @@ static bool drm_client_firmware_config(struct
drm_client_dev *client,
mode_copy_if_not_null(&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;
--
2.45.2
