From: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Date: Mon, 3 Nov 2014 20:20:29 +0000 (-0200)
Subject: drm/exynos: rename base object of struct exynos_drm_crtc to 'base'
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=357193cd782e0716027c1b1ae5bae79e1db7d4ca;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

drm/exynos: rename base object of struct exynos_drm_crtc to 'base'

'base' is more widely used name in the drm subsystem for the base object.

Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Signed-off-by: Inki Dae <inki.dae@samsung.com>
---

diff --git a/drivers/gpu/drm/exynos/exynos_drm_crtc.c b/drivers/gpu/drm/exynos/exynos_drm_crtc.c
index 5b3d18225fd6..1cdf7050ee89 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_crtc.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_crtc.c
@@ -324,8 +324,8 @@ int exynos_drm_crtc_create(struct exynos_drm_manager *manager)
 		goto err_plane;
 	}
 
-	manager->crtc = &exynos_crtc->drm_crtc;
-	crtc = &exynos_crtc->drm_crtc;
+	manager->crtc = &exynos_crtc->base;
+	crtc = &exynos_crtc->base;
 
 	private->crtc[manager->pipe] = crtc;
 
diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.h b/drivers/gpu/drm/exynos/exynos_drm_drv.h
index 187dde53625c..0a565f83be4d 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_drv.h
+++ b/drivers/gpu/drm/exynos/exynos_drm_drv.h
@@ -23,8 +23,7 @@
 #define MAX_FB_BUFFER	4
 #define DEFAULT_ZPOS	-1
 
-#define to_exynos_crtc(x)	container_of(x, struct exynos_drm_crtc,\
-				drm_crtc)
+#define to_exynos_crtc(x)	container_of(x, struct exynos_drm_crtc, base)
 #define to_exynos_plane(x)	container_of(x, struct exynos_drm_plane, base)
 
 /* This enumerates device type. */
@@ -229,7 +228,7 @@ enum exynos_crtc_mode {
 /*
  * Exynos specific crtc structure.
  *
- * @drm_crtc: crtc object.
+ * @base: crtc object.
  * @manager: the manager associated with this crtc
  * @pipe: a crtc index created at load() with a new crtc object creation
  *	and the crtc object would be set to private->crtc array
@@ -242,7 +241,7 @@ enum exynos_crtc_mode {
  * @mode: store the crtc mode value
  */
 struct exynos_drm_crtc {
-	struct drm_crtc			drm_crtc;
+	struct drm_crtc			base;
 	struct exynos_drm_manager	*manager;
 	unsigned int			pipe;
 	unsigned int			dpms;