summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorGustavo Padovan <gustavo.padovan@collabora.co.uk>2014-11-03 18:20:29 -0200
committerInki Dae <daeinki@gmail.com>2015-01-25 21:28:06 +0900
commit357193cd782e0716027c1b1ae5bae79e1db7d4ca (patch)
treec14c1737839c2f90c5591fa76303be9f1ec8aba9 /drivers
parentfd092d7a11a237393f633bdc5b93a3624e872ea6 (diff)
downloadlinux-stable-357193cd782e0716027c1b1ae5bae79e1db7d4ca.tar.gz
linux-stable-357193cd782e0716027c1b1ae5bae79e1db7d4ca.tar.bz2
linux-stable-357193cd782e0716027c1b1ae5bae79e1db7d4ca.zip
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/exynos/exynos_drm_crtc.c4
-rw-r--r--drivers/gpu/drm/exynos/exynos_drm_drv.h7
2 files changed, 5 insertions, 6 deletions
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;