diff options
author | Andrzej Hajda <a.hajda@samsung.com> | 2014-11-17 03:54:27 -0500 |
---|---|---|
committer | Inki Dae <inki.dae@samsung.com> | 2014-11-24 04:02:56 -0500 |
commit | 5af3d9bb78f130819204ef44ac9d2b635e49fc35 (patch) | |
tree | 611b65efe3c6984d637008fd874bb365717d7b8d | |
parent | 4cfde1f2af076547ebe86f8632e65119f28438b8 (diff) |
drm/exynos/dpi: stop using display->ctx pointer
The patch replaces accesses to display->ctx pointer by container_of
construct. The field is removed as well as dpi was the last user of it.
Signed-off-by: Andrzej Hajda <a.hajda@samsung.com>
Signed-off-by: Inki Dae <inki.dae@samsung.com>
-rw-r--r-- | drivers/gpu/drm/exynos/exynos_drm_dpi.c | 5 | ||||
-rw-r--r-- | drivers/gpu/drm/exynos/exynos_drm_drv.h | 1 |
2 files changed, 2 insertions, 4 deletions
diff --git a/drivers/gpu/drm/exynos/exynos_drm_dpi.c b/drivers/gpu/drm/exynos/exynos_drm_dpi.c index 3acfc288d17c..37678cf4425a 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_dpi.c +++ b/drivers/gpu/drm/exynos/exynos_drm_dpi.c | |||
@@ -106,7 +106,7 @@ static struct drm_connector_helper_funcs exynos_dpi_connector_helper_funcs = { | |||
106 | static int exynos_dpi_create_connector(struct exynos_drm_display *display, | 106 | static int exynos_dpi_create_connector(struct exynos_drm_display *display, |
107 | struct drm_encoder *encoder) | 107 | struct drm_encoder *encoder) |
108 | { | 108 | { |
109 | struct exynos_dpi *ctx = display->ctx; | 109 | struct exynos_dpi *ctx = display_to_dpi(display); |
110 | struct drm_connector *connector = &ctx->connector; | 110 | struct drm_connector *connector = &ctx->connector; |
111 | int ret; | 111 | int ret; |
112 | 112 | ||
@@ -147,7 +147,7 @@ static void exynos_dpi_poweroff(struct exynos_dpi *ctx) | |||
147 | 147 | ||
148 | static void exynos_dpi_dpms(struct exynos_drm_display *display, int mode) | 148 | static void exynos_dpi_dpms(struct exynos_drm_display *display, int mode) |
149 | { | 149 | { |
150 | struct exynos_dpi *ctx = display->ctx; | 150 | struct exynos_dpi *ctx = display_to_dpi(display); |
151 | 151 | ||
152 | switch (mode) { | 152 | switch (mode) { |
153 | case DRM_MODE_DPMS_ON: | 153 | case DRM_MODE_DPMS_ON: |
@@ -307,7 +307,6 @@ struct exynos_drm_display *exynos_dpi_probe(struct device *dev) | |||
307 | ctx->display.type = EXYNOS_DISPLAY_TYPE_LCD; | 307 | ctx->display.type = EXYNOS_DISPLAY_TYPE_LCD; |
308 | ctx->display.ops = &exynos_dpi_display_ops; | 308 | ctx->display.ops = &exynos_dpi_display_ops; |
309 | ctx->dev = dev; | 309 | ctx->dev = dev; |
310 | ctx->display.ctx = ctx; | ||
311 | ctx->dpms_mode = DRM_MODE_DPMS_OFF; | 310 | ctx->dpms_mode = DRM_MODE_DPMS_OFF; |
312 | 311 | ||
313 | ret = exynos_drm_component_add(dev, | 312 | ret = exynos_drm_component_add(dev, |
diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.h b/drivers/gpu/drm/exynos/exynos_drm_drv.h index b023f5fea25f..2e4e91bf9b07 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_drv.h +++ b/drivers/gpu/drm/exynos/exynos_drm_drv.h | |||
@@ -152,7 +152,6 @@ struct exynos_drm_display { | |||
152 | struct drm_encoder *encoder; | 152 | struct drm_encoder *encoder; |
153 | struct drm_connector *connector; | 153 | struct drm_connector *connector; |
154 | struct exynos_drm_display_ops *ops; | 154 | struct exynos_drm_display_ops *ops; |
155 | void *ctx; | ||
156 | }; | 155 | }; |
157 | 156 | ||
158 | /* | 157 | /* |