Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/i915: Keep overlay functions naming consistent

All other overlay functions(almost all other functions in i915)
follow intel_overlay_verb, so renaming overlay ones that do not match
that.

Cc: Jani Nikula <jani.nikula@intel.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: José Roberto de Souza <jose.souza@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20181108001647.11276-4-jose.souza@intel.com

+6 -6
+1 -1
drivers/gpu/drm/i915/i915_drv.c
··· 694 694 if (ret) 695 695 goto cleanup_modeset; 696 696 697 - intel_setup_overlay(dev_priv); 697 + intel_overlay_setup(dev_priv); 698 698 699 699 if (INTEL_INFO(dev_priv)->num_pipes == 0) 700 700 return 0;
+1 -1
drivers/gpu/drm/i915/intel_display.c
··· 15826 15826 15827 15827 drm_mode_config_cleanup(dev); 15828 15828 15829 - intel_cleanup_overlay(dev_priv); 15829 + intel_overlay_cleanup(dev_priv); 15830 15830 15831 15831 intel_teardown_gmbus(dev_priv); 15832 15832
+2 -2
drivers/gpu/drm/i915/intel_drv.h
··· 1962 1962 bool intel_is_dual_link_lvds(struct drm_device *dev); 1963 1963 1964 1964 /* intel_overlay.c */ 1965 - void intel_setup_overlay(struct drm_i915_private *dev_priv); 1966 - void intel_cleanup_overlay(struct drm_i915_private *dev_priv); 1965 + void intel_overlay_setup(struct drm_i915_private *dev_priv); 1966 + void intel_overlay_cleanup(struct drm_i915_private *dev_priv); 1967 1967 int intel_overlay_switch_off(struct intel_overlay *overlay); 1968 1968 int intel_overlay_put_image_ioctl(struct drm_device *dev, void *data, 1969 1969 struct drm_file *file_priv);
+2 -2
drivers/gpu/drm/i915/intel_overlay.c
··· 1338 1338 return err; 1339 1339 } 1340 1340 1341 - void intel_setup_overlay(struct drm_i915_private *dev_priv) 1341 + void intel_overlay_setup(struct drm_i915_private *dev_priv) 1342 1342 { 1343 1343 struct intel_overlay *overlay; 1344 1344 int ret; ··· 1387 1387 kfree(overlay); 1388 1388 } 1389 1389 1390 - void intel_cleanup_overlay(struct drm_i915_private *dev_priv) 1390 + void intel_overlay_cleanup(struct drm_i915_private *dev_priv) 1391 1391 { 1392 1392 struct intel_overlay *overlay; 1393 1393