Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 78dae1ac authored by Janusz Krzysztofik's avatar Janusz Krzysztofik Committed by Chris Wilson
Browse files

drm/i915: Propagate "_remove" function name suffix down 



Similar to the "_release" case, consistently replace mixed
"_cleanup"/"_fini"/"_fini_hw" components found in names of functions
called from i915_driver_remove() with "_remove" or "_driver_remove"
suffixes for better code readability.

Signed-off-by: default avatarJanusz Krzysztofik <janusz.krzysztofik@linux.intel.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20190712112429.740-6-janusz.krzysztofik@linux.intel.com
parent 3b58a945

drivers/gpu/drm/i915/display/intel_bios.c

+2 −2
Original line number Diff line number Diff line
@@ -1908,10 +1908,10 @@ void intel_bios_init(struct drm_i915_private *dev_priv) 
}



/**

 * intel_bios_cleanup - Free any resources allocated by intel_bios_init()

 * intel_bios_driver_remove - Free any resources allocated by intel_bios_init()

 * @dev_priv: i915 device instance

 */

void intel_bios_cleanup(struct drm_i915_private *dev_priv)

void intel_bios_driver_remove(struct drm_i915_private *dev_priv)

{

	kfree(dev_priv->vbt.child_dev);

	dev_priv->vbt.child_dev = NULL;

drivers/gpu/drm/i915/display/intel_bios.h

+1 −1
Original line number Diff line number Diff line
@@ -228,7 +228,7 @@ struct mipi_pps_data { 
} __packed;



void intel_bios_init(struct drm_i915_private *dev_priv);

void intel_bios_cleanup(struct drm_i915_private *dev_priv);

void intel_bios_driver_remove(struct drm_i915_private *dev_priv);

bool intel_bios_is_valid_vbt(const void *buf, size_t size);

bool intel_bios_is_tv_present(struct drm_i915_private *dev_priv);

bool intel_bios_is_lvds_present(struct drm_i915_private *dev_priv, u8 *i2c_pin);

drivers/gpu/drm/i915/display/intel_display.c

+1 −1
Original line number Diff line number Diff line
@@ -17092,7 +17092,7 @@ static void intel_hpd_poll_fini(struct drm_device *dev) 
	drm_connector_list_iter_end(&conn_iter);

}



void intel_modeset_cleanup(struct drm_device *dev)

void intel_modeset_driver_remove(struct drm_device *dev)

{

	struct drm_i915_private *dev_priv = to_i915(dev);

drivers/gpu/drm/i915/display/intel_display_power.c

+3 −3
Original line number Diff line number Diff line
@@ -4902,7 +4902,7 @@ static void intel_power_domains_verify_state(struct drm_i915_private *dev_priv); 
 *

 * It will return with power domains disabled (to be enabled later by

 * intel_power_domains_enable()) and must be paired with

 * intel_power_domains_fini_hw().

 * intel_power_domains_driver_remove().

 */

void intel_power_domains_init_hw(struct drm_i915_private *i915, bool resume)

{
@@ -4954,7 +4954,7 @@ void intel_power_domains_init_hw(struct drm_i915_private *i915, bool resume) 
}



/**

 * intel_power_domains_fini_hw - deinitialize hw power domain state

 * intel_power_domains_driver_remove - deinitialize hw power domain state

 * @i915: i915 device instance

 *

 * De-initializes the display power domain HW state. It also ensures that the
@@ -4964,7 +4964,7 @@ void intel_power_domains_init_hw(struct drm_i915_private *i915, bool resume) 
 * intel_power_domains_disable()) and must be paired with

 * intel_power_domains_init_hw().

 */

void intel_power_domains_fini_hw(struct drm_i915_private *i915)

void intel_power_domains_driver_remove(struct drm_i915_private *i915)

{

	intel_wakeref_t wakeref __maybe_unused =

		fetch_and_zero(&i915->power_domains.wakeref);

drivers/gpu/drm/i915/display/intel_display_power.h

+1 −1
Original line number Diff line number Diff line
@@ -241,7 +241,7 @@ void gen9_enable_dc5(struct drm_i915_private *dev_priv); 
int intel_power_domains_init(struct drm_i915_private *dev_priv);

void intel_power_domains_cleanup(struct drm_i915_private *dev_priv);

void intel_power_domains_init_hw(struct drm_i915_private *dev_priv, bool resume);

void intel_power_domains_fini_hw(struct drm_i915_private *dev_priv);

void intel_power_domains_driver_remove(struct drm_i915_private *dev_priv);

void icl_display_core_init(struct drm_i915_private *dev_priv, bool resume);

void icl_display_core_uninit(struct drm_i915_private *dev_priv);

void intel_power_domains_enable(struct drm_i915_private *dev_priv);