3 files changed, 12 insertions, 12 deletions

diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index 9f8b46574956..79585cddc2cd 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -455,7 +455,7 @@ struct intel_hdmi {
         bool rgb_quant_range_selectable;
         void (*write_infoframe)(struct drm_encoder *encoder,
                                 enum hdmi_infoframe_type type,
-                                const uint8_t *frame, ssize_t len);
+                                const void *frame, ssize_t len);
         void (*set_infoframes)(struct drm_encoder *encoder,
                                struct drm_display_mode *adjusted_mode);
 };
diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
index 6a6ad0c78dc7..6db0d9d17f47 100644
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -130,9 +130,9 @@ static u32 hsw_infoframe_data_reg(enum hdmi_infoframe_type type,
 
 static void g4x_write_infoframe(struct drm_encoder *encoder,
                                 enum hdmi_infoframe_type type,
-                                const uint8_t *frame, ssize_t len)
+                                const void *frame, ssize_t len)
 {
-        uint32_t *data = (uint32_t *)frame;
+        const uint32_t *data = frame;
         struct drm_device *dev = encoder->dev;
         struct drm_i915_private *dev_priv = dev->dev_private;
         u32 val = I915_READ(VIDEO_DIP_CTL);
@@ -167,9 +167,9 @@ static void g4x_write_infoframe(struct drm_encoder *encoder,
 
 static void ibx_write_infoframe(struct drm_encoder *encoder,
                                 enum hdmi_infoframe_type type,
-                                const uint8_t *frame, ssize_t len)
+                                const void *frame, ssize_t len)
 {
-        uint32_t *data = (uint32_t *)frame;
+        const uint32_t *data = frame;
         struct drm_device *dev = encoder->dev;
         struct drm_i915_private *dev_priv = dev->dev_private;
         struct intel_crtc *intel_crtc = to_intel_crtc(encoder->crtc);
@@ -205,9 +205,9 @@ static void ibx_write_infoframe(struct drm_encoder *encoder,
 
 static void cpt_write_infoframe(struct drm_encoder *encoder,
                                 enum hdmi_infoframe_type type,
-                                const uint8_t *frame, ssize_t len)
+                                const void *frame, ssize_t len)
 {
-        uint32_t *data = (uint32_t *)frame;
+        const uint32_t *data = frame;
         struct drm_device *dev = encoder->dev;
         struct drm_i915_private *dev_priv = dev->dev_private;
         struct intel_crtc *intel_crtc = to_intel_crtc(encoder->crtc);
@@ -246,9 +246,9 @@ static void cpt_write_infoframe(struct drm_encoder *encoder,
 
 static void vlv_write_infoframe(struct drm_encoder *encoder,
                                 enum hdmi_infoframe_type type,
-                                const uint8_t *frame, ssize_t len)
+                                const void *frame, ssize_t len)
 {
-        uint32_t *data = (uint32_t *)frame;
+        const uint32_t *data = frame;
         struct drm_device *dev = encoder->dev;
         struct drm_i915_private *dev_priv = dev->dev_private;
         struct intel_crtc *intel_crtc = to_intel_crtc(encoder->crtc);
@@ -284,9 +284,9 @@ static void vlv_write_infoframe(struct drm_encoder *encoder,
 
 static void hsw_write_infoframe(struct drm_encoder *encoder,
                                 enum hdmi_infoframe_type type,
-                                const uint8_t *frame, ssize_t len)
+                                const void *frame, ssize_t len)
 {
-        uint32_t *data = (uint32_t *)frame;
+        const uint32_t *data = frame;
         struct drm_device *dev = encoder->dev;
         struct drm_i915_private *dev_priv = dev->dev_private;
         struct intel_crtc *intel_crtc = to_intel_crtc(encoder->crtc);
diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
index 2abeab09e883..95bdfb3c431c 100644
--- a/drivers/gpu/drm/i915/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/intel_sdvo.c
@@ -952,7 +952,7 @@ static void intel_sdvo_dump_hdmi_buf(struct intel_sdvo *intel_sdvo)
 
 static bool intel_sdvo_write_infoframe(struct intel_sdvo *intel_sdvo,
                                        unsigned if_index, uint8_t tx_rate,
-                                       uint8_t *data, unsigned length)
+                                       const uint8_t *data, unsigned length)
 {
         uint8_t set_buf_index[2] = { if_index, 0 };
         uint8_t hbuf_size, tmp[8];