From f7e23cbbb8ea9281a30e03a67dd2abe44531d751 Mon Sep 17 00:00:00 2001 From: Jingoo Han Date: Thu, 23 Aug 2012 19:54:16 +0900 Subject: [PATCH] --- yaml --- r: 333437 b: refs/heads/master c: 1ec7be9c9f3ee416d5c97c1c649f3cba9e41ee1d h: refs/heads/master i: 333435: 808ebe73232d31dad174b1903a8ae0566130e747 v: v3 --- [refs] | 2 +- trunk/drivers/video/exynos/exynos_dp_core.h | 2 +- trunk/drivers/video/exynos/exynos_dp_reg.c | 4 +--- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 92061f3c82aa..25413b3957ea 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 09d00d170f8da388761cc29de1cf8c12c69c1300 +refs/heads/master: 1ec7be9c9f3ee416d5c97c1c649f3cba9e41ee1d diff --git a/trunk/drivers/video/exynos/exynos_dp_core.h b/trunk/drivers/video/exynos/exynos_dp_core.h index 4af4504cf5b1..57b8a6531c0e 100644 --- a/trunk/drivers/video/exynos/exynos_dp_core.h +++ b/trunk/drivers/video/exynos/exynos_dp_core.h @@ -105,7 +105,7 @@ u32 exynos_dp_get_lane1_link_training(struct exynos_dp_device *dp); u32 exynos_dp_get_lane2_link_training(struct exynos_dp_device *dp); u32 exynos_dp_get_lane3_link_training(struct exynos_dp_device *dp); void exynos_dp_reset_macro(struct exynos_dp_device *dp); -int exynos_dp_init_video(struct exynos_dp_device *dp); +void exynos_dp_init_video(struct exynos_dp_device *dp); void exynos_dp_set_video_color_format(struct exynos_dp_device *dp, u32 color_depth, diff --git a/trunk/drivers/video/exynos/exynos_dp_reg.c b/trunk/drivers/video/exynos/exynos_dp_reg.c index 1acba7417b38..d909b834b05e 100644 --- a/trunk/drivers/video/exynos/exynos_dp_reg.c +++ b/trunk/drivers/video/exynos/exynos_dp_reg.c @@ -1009,7 +1009,7 @@ void exynos_dp_reset_macro(struct exynos_dp_device *dp) writel(reg, dp->reg_base + EXYNOS_DP_PHY_TEST); } -int exynos_dp_init_video(struct exynos_dp_device *dp) +void exynos_dp_init_video(struct exynos_dp_device *dp) { u32 reg; @@ -1027,8 +1027,6 @@ int exynos_dp_init_video(struct exynos_dp_device *dp) reg = VID_HRES_TH(2) | VID_VRES_TH(0); writel(reg, dp->reg_base + EXYNOS_DP_VIDEO_CTL_8); - - return 0; } void exynos_dp_set_video_color_format(struct exynos_dp_device *dp,