From: Jani Nikula Date: Mon, 13 Apr 2015 08:21:40 +0000 (+0300) Subject: drm/radeon: constify more struct drm_*_helper funcs pointers X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=16bb079e45f2c3a795b6b0546535cd6466275ec5;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git drm/radeon: constify more struct drm_*_helper funcs pointers Some non-const pointers were added since the last constification, fix them. Signed-off-by: Jani Nikula Reviewed-by: Christian König Signed-off-by: Daniel Vetter --- diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c b/drivers/gpu/drm/radeon/radeon_connectors.c index f150c2495fa4..cebb65e07e1d 100644 --- a/drivers/gpu/drm/radeon/radeon_connectors.c +++ b/drivers/gpu/drm/radeon/radeon_connectors.c @@ -751,7 +751,7 @@ static int radeon_connector_set_property(struct drm_connector *connector, struct if (connector->encoder) radeon_encoder = to_radeon_encoder(connector->encoder); else { - struct drm_connector_helper_funcs *connector_funcs = connector->helper_private; + const struct drm_connector_helper_funcs *connector_funcs = connector->helper_private; radeon_encoder = to_radeon_encoder(connector_funcs->best_encoder(connector)); } @@ -762,7 +762,7 @@ static int radeon_connector_set_property(struct drm_connector *connector, struct if (connector->encoder->crtc) { struct drm_crtc *crtc = connector->encoder->crtc; - struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private; + const struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private; struct radeon_crtc *radeon_crtc = to_radeon_crtc(crtc); radeon_crtc->output_csc = radeon_encoder->output_csc; diff --git a/drivers/gpu/drm/radeon/radeon_dp_mst.c b/drivers/gpu/drm/radeon/radeon_dp_mst.c index 5952ff2bb647..1017338a49d9 100644 --- a/drivers/gpu/drm/radeon/radeon_dp_mst.c +++ b/drivers/gpu/drm/radeon/radeon_dp_mst.c @@ -604,7 +604,7 @@ radeon_dp_create_fake_mst_encoder(struct radeon_connector *connector) struct radeon_encoder *radeon_encoder; struct radeon_encoder_mst *mst_enc; struct drm_encoder *encoder; - struct drm_connector_helper_funcs *connector_funcs = connector->base.helper_private; + const struct drm_connector_helper_funcs *connector_funcs = connector->base.helper_private; struct drm_encoder *enc_master = connector_funcs->best_encoder(&connector->base); DRM_DEBUG_KMS("enc master is %p\n", enc_master);