summaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorSylwester Nawrocki <s.nawrocki@samsung.com>2013-06-11 15:44:38 +0200
committerMauro Carvalho Chehab <mchehab@redhat.com>2013-06-28 20:13:11 +0200
commit47d1f33ff43e3d4f74fff1892d44d1de34a80be2 (patch)
tree6e8f855cca8d93cff2a21134a41ebe3eb8dc5046 /drivers/media
parent[media] media: i2c: tvp514x: remove manual setting of subdev name (diff)
downloadlinux-47d1f33ff43e3d4f74fff1892d44d1de34a80be2.tar.xz
linux-47d1f33ff43e3d4f74fff1892d44d1de34a80be2.zip
[media] exynos4-is: Drop drvdata handling in fimc-lite for non-dt platforms
The FIMC-LITE IP block is available only on platforms instantiated from device tree. Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/platform/exynos4-is/fimc-lite.c3
-rw-r--r--drivers/media/platform/exynos4-is/fimc-lite.h3
2 files changed, 0 insertions, 6 deletions
diff --git a/drivers/media/platform/exynos4-is/fimc-lite.c b/drivers/media/platform/exynos4-is/fimc-lite.c
index 3f76f8abc4b3..00c525c377d8 100644
--- a/drivers/media/platform/exynos4-is/fimc-lite.c
+++ b/drivers/media/platform/exynos4-is/fimc-lite.c
@@ -1449,9 +1449,6 @@ static int fimc_lite_probe(struct platform_device *pdev)
if (of_id)
drv_data = (struct flite_drvdata *)of_id->data;
fimc->index = of_alias_get_id(dev->of_node, "fimc-lite");
- } else {
- drv_data = fimc_lite_get_drvdata(pdev);
- fimc->index = pdev->id;
}
if (!drv_data || fimc->index < 0 || fimc->index >= FIMC_LITE_MAX_DEVS)
diff --git a/drivers/media/platform/exynos4-is/fimc-lite.h b/drivers/media/platform/exynos4-is/fimc-lite.h
index c7aa08477830..4b1068425dad 100644
--- a/drivers/media/platform/exynos4-is/fimc-lite.h
+++ b/drivers/media/platform/exynos4-is/fimc-lite.h
@@ -56,9 +56,6 @@ struct flite_drvdata {
unsigned short out_hor_offs_align;
};
-#define fimc_lite_get_drvdata(_pdev) \
- ((struct flite_drvdata *) platform_get_device_id(_pdev)->driver_data)
-
struct fimc_lite_events {
unsigned int data_overflow;
};