diff options
| author | Sylwester Nawrocki <s.nawrocki@samsung.com> | 2013-06-11 09:44:38 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-06-28 14:13:11 -0400 |
| commit | 47d1f33ff43e3d4f74fff1892d44d1de34a80be2 (patch) | |
| tree | 6e8f855cca8d93cff2a21134a41ebe3eb8dc5046 | |
| parent | f042ff650f47ea2868e5f89fa76370d4ebe43f4b (diff) | |
[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>
| -rw-r--r-- | drivers/media/platform/exynos4-is/fimc-lite.c | 3 | ||||
| -rw-r--r-- | drivers/media/platform/exynos4-is/fimc-lite.h | 3 |
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) | |||
| 1449 | if (of_id) | 1449 | if (of_id) |
| 1450 | drv_data = (struct flite_drvdata *)of_id->data; | 1450 | drv_data = (struct flite_drvdata *)of_id->data; |
| 1451 | fimc->index = of_alias_get_id(dev->of_node, "fimc-lite"); | 1451 | fimc->index = of_alias_get_id(dev->of_node, "fimc-lite"); |
| 1452 | } else { | ||
| 1453 | drv_data = fimc_lite_get_drvdata(pdev); | ||
| 1454 | fimc->index = pdev->id; | ||
| 1455 | } | 1452 | } |
| 1456 | 1453 | ||
| 1457 | if (!drv_data || fimc->index < 0 || fimc->index >= FIMC_LITE_MAX_DEVS) | 1454 | 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 { | |||
| 56 | unsigned short out_hor_offs_align; | 56 | unsigned short out_hor_offs_align; |
| 57 | }; | 57 | }; |
| 58 | 58 | ||
| 59 | #define fimc_lite_get_drvdata(_pdev) \ | ||
| 60 | ((struct flite_drvdata *) platform_get_device_id(_pdev)->driver_data) | ||
| 61 | |||
| 62 | struct fimc_lite_events { | 59 | struct fimc_lite_events { |
| 63 | unsigned int data_overflow; | 60 | unsigned int data_overflow; |
| 64 | }; | 61 | }; |
