They're only used to store const pointers anyway. This helps to keep
Ville and the compiler happy.

Christian König <christian.koenig at amd.com>
Signed-off-by: Jani Nikula <jani.nikula at intel.com>
---
 include/drm/drm_crtc.h         | 8 ++++----
 include/drm/drm_crtc_helper.h  | 6 +++---
 include/drm/drm_plane_helper.h | 2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h
index 150b93c29150..d4e4b82da3ad 100644
--- a/include/drm/drm_crtc.h
+++ b/include/drm/drm_crtc.h
@@ -466,7 +466,7 @@ struct drm_crtc {
        int framedur_ns, linedur_ns, pixeldur_ns;

        /* if you are using the helper */
-       void *helper_private;
+       const void *helper_private;

        struct drm_object_properties properties;

@@ -596,7 +596,7 @@ struct drm_encoder {
        struct drm_crtc *crtc;
        struct drm_bridge *bridge;
        const struct drm_encoder_funcs *funcs;
-       void *helper_private;
+       const void *helper_private;
 };

 /* should we poll this connector for connects and disconnects */
@@ -700,7 +700,7 @@ struct drm_connector {
        /* requested DPMS state */
        int dpms;

-       void *helper_private;
+       const void *helper_private;

        /* forced on connector */
        struct drm_cmdline_mode cmdline_mode;
@@ -863,7 +863,7 @@ struct drm_plane {

        enum drm_plane_type type;

-       void *helper_private;
+       const void *helper_private;

        struct drm_plane_state *state;
 };
diff --git a/include/drm/drm_crtc_helper.h b/include/drm/drm_crtc_helper.h
index 92d5135b55d2..c8fc187061de 100644
--- a/include/drm/drm_crtc_helper.h
+++ b/include/drm/drm_crtc_helper.h
@@ -197,19 +197,19 @@ extern void drm_helper_mode_fill_fb_struct(struct 
drm_framebuffer *fb,
 static inline void drm_crtc_helper_add(struct drm_crtc *crtc,
                                       const struct drm_crtc_helper_funcs 
*funcs)
 {
-       crtc->helper_private = (void *)funcs;
+       crtc->helper_private = funcs;
 }

 static inline void drm_encoder_helper_add(struct drm_encoder *encoder,
                                          const struct drm_encoder_helper_funcs 
*funcs)
 {
-       encoder->helper_private = (void *)funcs;
+       encoder->helper_private = funcs;
 }

 static inline void drm_connector_helper_add(struct drm_connector *connector,
                                            const struct 
drm_connector_helper_funcs *funcs)
 {
-       connector->helper_private = (void *)funcs;
+       connector->helper_private = funcs;
 }

 extern void drm_helper_resume_force_mode(struct drm_device *dev);
diff --git a/include/drm/drm_plane_helper.h b/include/drm/drm_plane_helper.h
index e48157a5a59c..96e16283afb9 100644
--- a/include/drm/drm_plane_helper.h
+++ b/include/drm/drm_plane_helper.h
@@ -76,7 +76,7 @@ struct drm_plane_helper_funcs {
 static inline void drm_plane_helper_add(struct drm_plane *plane,
                                        const struct drm_plane_helper_funcs 
*funcs)
 {
-       plane->helper_private = (void *)funcs;
+       plane->helper_private = funcs;
 }

 extern int drm_plane_helper_check_update(struct drm_plane *plane,
-- 
2.1.4

Reply via email to