drm/via: Rename via_encoder_cleanup() to via_encoder_destroy()

Signed-off-by: Kevin Brace <kevinbrace@bracecomputerlab.com>

8 files changed, 9 insertions, 8 deletions

diff --git a/drivers/gpu/drm/via/via_dac.c b/drivers/gpu/drm/via/via_dac.c
index 94d0c8311431..0ac26da1f798 100644
--- a/drivers/gpu/drm/via/via_dac.c
+++ b/drivers/gpu/drm/via/via_dac.c
@@ -102,7 +102,7 @@ static void via_dac_display_source(struct via_drm_priv *dev_priv,
  * Routines for controlling stuff on the DAC port
  */
 static const struct drm_encoder_funcs via_dac_enc_funcs = {
-	.destroy = via_encoder_cleanup,
+	.destroy = via_encoder_destroy,
 };
 
 /*
diff --git a/drivers/gpu/drm/via/via_drv.h b/drivers/gpu/drm/via/via_drv.h
index 9e9184afa8ec..dad0aeef5824 100644
--- a/drivers/gpu/drm/via/via_drv.h
+++ b/drivers/gpu/drm/via/via_drv.h
@@ -347,7 +347,8 @@ void via_transmitter_data_drive_strength(struct via_drm_priv *dev_priv,
 					u32 di_port, u8 drive_strength);
 void via_transmitter_display_source(struct via_drm_priv *dev_priv,
 					u32 di_port, int index);
-void via_encoder_cleanup(struct drm_encoder *encoder);
+
+void via_encoder_destroy(struct drm_encoder *encoder);
 
 void via_connector_destroy(struct drm_connector *connector);
 
diff --git a/drivers/gpu/drm/via/via_encoder.c b/drivers/gpu/drm/via/via_encoder.c
index d7798f2ce5ba..5418a9257bf8 100644
--- a/drivers/gpu/drm/via/via_encoder.c
+++ b/drivers/gpu/drm/via/via_encoder.c
@@ -222,7 +222,7 @@ void via_transmitter_display_source(struct via_drm_priv *dev_priv,
 	DRM_DEBUG_KMS("Exiting %s.\n", __func__);
 }
 
-void via_encoder_cleanup(struct drm_encoder *encoder)
+void via_encoder_destroy(struct drm_encoder *encoder)
 {
 	struct via_encoder *enc = container_of(encoder, struct via_encoder, base);
 
diff --git a/drivers/gpu/drm/via/via_hdmi.c b/drivers/gpu/drm/via/via_hdmi.c
index 61dd5549034c..fc4e0a90dd11 100644
--- a/drivers/gpu/drm/via/via_hdmi.c
+++ b/drivers/gpu/drm/via/via_hdmi.c
@@ -50,7 +50,7 @@ module_param_named(audio, via_hdmi_audio, int, 0444);
  * Routines for controlling stuff on the HDMI port
  */
 static const struct drm_encoder_funcs via_hdmi_enc_funcs = {
-	.destroy = via_encoder_cleanup,
+	.destroy = via_encoder_destroy,
 };
 
 static void via_hdmi_enc_dpms(struct drm_encoder *encoder, int mode)
diff --git a/drivers/gpu/drm/via/via_lvds.c b/drivers/gpu/drm/via/via_lvds.c
index c4efef83d3c5..1460be6e079a 100644
--- a/drivers/gpu/drm/via/via_lvds.c
+++ b/drivers/gpu/drm/via/via_lvds.c
@@ -731,7 +731,7 @@ const struct drm_encoder_helper_funcs via_lvds_helper_funcs = {
 };
 
 const struct drm_encoder_funcs via_lvds_enc_funcs = {
-	.destroy = via_encoder_cleanup,
+	.destroy = via_encoder_destroy,
 };
 
 /* Detect FP presence. */
diff --git a/drivers/gpu/drm/via/via_sii164.c b/drivers/gpu/drm/via/via_sii164.c
index f676b79df1c5..89461b9b7412 100644
--- a/drivers/gpu/drm/via/via_sii164.c
+++ b/drivers/gpu/drm/via/via_sii164.c
@@ -127,7 +127,7 @@ static void via_sii164_init_registers(struct i2c_adapter *i2c_bus)
 
 
 static const struct drm_encoder_funcs via_sii164_drm_encoder_funcs = {
-	.destroy = via_encoder_cleanup,
+	.destroy = via_encoder_destroy,
 };
 
 static void via_sii164_dpms(struct drm_encoder *encoder, int mode)
diff --git a/drivers/gpu/drm/via/via_tmds.c b/drivers/gpu/drm/via/via_tmds.c
index d532c8dfb8db..ed5a8cd55203 100644
--- a/drivers/gpu/drm/via/via_tmds.c
+++ b/drivers/gpu/drm/via/via_tmds.c
@@ -195,7 +195,7 @@ static void via_tmds_display_source(struct via_drm_priv *dev_priv,
  * Routines for controlling stuff on the TMDS port
  */
 static const struct drm_encoder_funcs via_tmds_enc_funcs = {
-	.destroy = via_encoder_cleanup,
+	.destroy = via_encoder_destroy,
 };
 
 static void via_tmds_dpms(struct drm_encoder *encoder, int mode)
diff --git a/drivers/gpu/drm/via/via_vt1632.c b/drivers/gpu/drm/via/via_vt1632.c
index 607f1881a1e0..9437ef4d2501 100644
--- a/drivers/gpu/drm/via/via_vt1632.c
+++ b/drivers/gpu/drm/via/via_vt1632.c
@@ -147,7 +147,7 @@ static void via_vt1632_init_registers(struct i2c_adapter *i2c_bus)
 
 
 static const struct drm_encoder_funcs via_vt1632_drm_encoder_funcs = {
-	.destroy = via_encoder_cleanup,
+	.destroy = via_encoder_destroy,
 };
 
 static void via_vt1632_dpms(struct drm_encoder *encoder, int mode)