[Openchrome-devel] drm-openchrome: Branch 'drm-next-4.13' - drivers/gpu/drm

[Kevin Brace]

 drivers/gpu/drm/openchrome/via_display.c |    2 +-
 drivers/gpu/drm/openchrome/via_display.h |    2 +-
 drivers/gpu/drm/openchrome/via_fb.c      |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 084481383b1bed8d74b04e1f952d0c3d9d151fe6
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Thu Aug 17 23:15:19 2017 -0700

    Rename via_framebuffer_fini to via_fbdev_fini
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/drivers/gpu/drm/openchrome/via_display.c b/drivers/gpu/drm/openchrome/via_display.c
index e6f87131cda6..37ac7a78b615 100644
--- a/drivers/gpu/drm/openchrome/via_display.c
+++ b/drivers/gpu/drm/openchrome/via_display.c
@@ -554,7 +554,7 @@ void via_modeset_fini(struct drm_device *dev)
 	struct drm_encoder *encoder, *enct;
 
 	drm_kms_helper_poll_fini(dev);
-	via_framebuffer_fini(dev);
+	via_fbdev_fini(dev);
 
 	/* drm_mode_config_init has not been called yet */
 	if (!dev->mode_config.dpms_property)
diff --git a/drivers/gpu/drm/openchrome/via_display.h b/drivers/gpu/drm/openchrome/via_display.h
index 4e8ab52f1d43..f67beb15ec0c 100644
--- a/drivers/gpu/drm/openchrome/via_display.h
+++ b/drivers/gpu/drm/openchrome/via_display.h
@@ -144,7 +144,7 @@ extern void via_set_vclock(struct drm_crtc *crtc, u32 clk);
 
 /* framebuffers */
 extern int via_fbdev_init(struct drm_device *dev);
-extern void via_framebuffer_fini(struct drm_device *dev);
+extern void via_fbdev_fini(struct drm_device *dev);
 
 /* crtc */
 extern void via_load_crtc_pixel_timing(struct drm_crtc *crtc,
diff --git a/drivers/gpu/drm/openchrome/via_fb.c b/drivers/gpu/drm/openchrome/via_fb.c
index 6accbb2ea894..9afbfea93370 100644
--- a/drivers/gpu/drm/openchrome/via_fb.c
+++ b/drivers/gpu/drm/openchrome/via_fb.c
@@ -1240,7 +1240,7 @@ exit:
 	return ret;
 }
 
-void via_framebuffer_fini(struct drm_device *dev)
+void via_fbdev_fini(struct drm_device *dev)
 {
 	struct via_device *dev_priv = dev->dev_private;
 	struct drm_fb_helper *fb_helper = &dev_priv->via_fbdev->helper;