From: Gustavo Padovan gustavo.padovan@collabora.co.uk
'base' is more widely used name in the drm subsystem for the base object.
Signed-off-by: Gustavo Padovan gustavo.padovan@collabora.co.uk --- drivers/gpu/drm/exynos/exynos_drm_crtc.c | 4 ++-- drivers/gpu/drm/exynos/exynos_drm_drv.h | 7 +++---- 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 5b3d182..1cdf705 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 187dde5..0a565f8 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;