From 41c243464f2420744f1c14da77e230440c1c31b4 Mon Sep 17 00:00:00 2001 From: Inki Dae Date: Fri, 14 Oct 2011 13:29:48 +0900 Subject: [PATCH] drm/exynos: added device object as argument of subdrv_probe(). sub drivers should refer to its own device object to access its own context. Signed-off-by: Inki Dae Signed-off-by: Kyungmin Park Signed-off-by: Dave Airlie --- drivers/gpu/drm/exynos/exynos_drm_core.c | 2 +- drivers/gpu/drm/exynos/exynos_drm_drv.h | 2 +- drivers/gpu/drm/exynos/exynos_drm_fimd.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/exynos/exynos_drm_core.c b/drivers/gpu/drm/exynos/exynos_drm_core.c index edb0ee13cffc..661a03571d0c 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_core.c +++ b/drivers/gpu/drm/exynos/exynos_drm_core.c @@ -55,7 +55,7 @@ static int exynos_drm_subdrv_probe(struct drm_device *dev, * * P.S. note that this driver is considered for modularization. */ - ret = subdrv->probe(dev); + ret = subdrv->probe(dev, subdrv->manager.dev); if (ret) return ret; } diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.h b/drivers/gpu/drm/exynos/exynos_drm_drv.h index 4ea137158de3..002f2925106a 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_drv.h +++ b/drivers/gpu/drm/exynos/exynos_drm_drv.h @@ -219,7 +219,7 @@ struct exynos_drm_subdrv { struct list_head list; struct drm_device *drm_dev; - int (*probe)(struct drm_device *dev); + int (*probe)(struct drm_device *drm_dev, struct device *dev); void (*remove)(struct drm_device *dev); struct exynos_drm_manager manager; diff --git a/drivers/gpu/drm/exynos/exynos_drm_fimd.c b/drivers/gpu/drm/exynos/exynos_drm_fimd.c index 9d1138e4fb4e..b0afa8493230 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_fimd.c +++ b/drivers/gpu/drm/exynos/exynos_drm_fimd.c @@ -538,7 +538,7 @@ static irqreturn_t fimd_irq_handler(int irq, void *dev_id) return IRQ_HANDLED; } -static int fimd_subdrv_probe(struct drm_device *drm_dev) +static int fimd_subdrv_probe(struct drm_device *drm_dev, struct device *dev) { struct drm_driver *drm_driver = drm_dev->driver; -- 2.11.0