From: Ville Syrjälä ville.syrjala@linux.intel.com
Rename the local 'old_state' variable to 'old_mali_state' to get it out of the way of some cocci refactoring.
Signed-off-by: Ville Syrjälä ville.syrjala@linux.intel.com --- drivers/gpu/drm/arm/malidp_crtc.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/gpu/drm/arm/malidp_crtc.c b/drivers/gpu/drm/arm/malidp_crtc.c index 037514f42a83..2a92cb066bea 100644 --- a/drivers/gpu/drm/arm/malidp_crtc.c +++ b/drivers/gpu/drm/arm/malidp_crtc.c @@ -417,23 +417,23 @@ static const struct drm_crtc_helper_funcs malidp_crtc_helper_funcs = {
static struct drm_crtc_state *malidp_crtc_duplicate_state(struct drm_crtc *crtc) { - struct malidp_crtc_state *state, *old_state; + struct malidp_crtc_state *state, *old_mali_state;
if (WARN_ON(!crtc->state)) return NULL;
- old_state = to_malidp_crtc_state(crtc->state); + old_mali_state = to_malidp_crtc_state(crtc->state); state = kmalloc(sizeof(*state), GFP_KERNEL); if (!state) return NULL;
__drm_atomic_helper_crtc_duplicate_state(crtc, &state->base, crtc->state); - memcpy(state->gamma_coeffs, old_state->gamma_coeffs, + memcpy(state->gamma_coeffs, old_mali_state->gamma_coeffs, sizeof(state->gamma_coeffs)); - memcpy(state->coloradj_coeffs, old_state->coloradj_coeffs, + memcpy(state->coloradj_coeffs, old_mali_state->coloradj_coeffs, sizeof(state->coloradj_coeffs)); - memcpy(&state->scaler_config, &old_state->scaler_config, + memcpy(&state->scaler_config, &old_mali_state->scaler_config, sizeof(state->scaler_config)); state->scaled_planes_mask = 0;