| From 4440d555afb8b86124f45d58dca776671953be16 Mon Sep 17 00:00:00 2001 |
| From: Damien Lespiau <damien.lespiau@intel.com> |
| Date: Tue, 6 Aug 2013 20:32:24 +0100 |
| Subject: drm/i915/hmdi: Rename set_infoframe() to write_infoframe() |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| set_frame() wraps the write_frame() vfunc. Be consistent and name the |
| wrapping function like the vfunc being called. |
| |
| It's doubly confusing as we also have a set_infoframes() vfunc and |
| set_infoframe() doesn't wrap it. |
| |
| Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> |
| Signed-off-by: Damien Lespiau <damien.lespiau@intel.com> |
| Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> |
| (cherry picked from commit 9198ee5b9048418849ad96fe37eaff8cd56aaf43) |
| Signed-off-by: Darren Hart <dvhart@linux.intel.com> |
| --- |
| drivers/gpu/drm/i915/intel_hdmi.c | 8 ++++---- |
| 1 file changed, 4 insertions(+), 4 deletions(-) |
| |
| diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c |
| index 0a4a81447a03..dd4fa35e0a85 100644 |
| --- a/drivers/gpu/drm/i915/intel_hdmi.c |
| +++ b/drivers/gpu/drm/i915/intel_hdmi.c |
| @@ -327,8 +327,8 @@ static void hsw_write_infoframe(struct drm_encoder *encoder, |
| * trick them by giving an offset into the buffer and moving back the header |
| * bytes by one. |
| */ |
| -static void intel_set_infoframe(struct drm_encoder *encoder, |
| - union hdmi_infoframe *frame) |
| +static void intel_write_infoframe(struct drm_encoder *encoder, |
| + union hdmi_infoframe *frame) |
| { |
| struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(encoder); |
| uint8_t buffer[VIDEO_DIP_DATA_SIZE]; |
| @@ -373,7 +373,7 @@ static void intel_hdmi_set_avi_infoframe(struct drm_encoder *encoder, |
| HDMI_QUANTIZATION_RANGE_FULL; |
| } |
| |
| - intel_set_infoframe(encoder, &frame); |
| + intel_write_infoframe(encoder, &frame); |
| } |
| |
| static void intel_hdmi_set_spd_infoframe(struct drm_encoder *encoder) |
| @@ -389,7 +389,7 @@ static void intel_hdmi_set_spd_infoframe(struct drm_encoder *encoder) |
| |
| frame.spd.sdi = HDMI_SPD_SDI_PC; |
| |
| - intel_set_infoframe(encoder, &frame); |
| + intel_write_infoframe(encoder, &frame); |
| } |
| |
| static void g4x_set_infoframes(struct drm_encoder *encoder, |
| -- |
| 1.8.5.rc3 |
| |
