summaryrefslogtreecommitdiffstats
path: root/drivers/video/omap2/dss/dpi.c
diff options
context:
space:
mode:
authorArchit Taneja <archit@ti.com>2012-06-29 10:30:54 +0200
committerArchit Taneja <archit@ti.com>2012-06-29 10:30:54 +0200
commitf0d08f89ff27f7a600f21f443b6622132c9eb641 (patch)
tree317bf2ba54a4bd56fd43d5f237057ed6c0f20b47 /drivers/video/omap2/dss/dpi.c
parentARM: OMAP2PLUS: DSS: Disable LCD3 output when resetting DSS (diff)
downloadlinux-f0d08f89ff27f7a600f21f443b6622132c9eb641.tar.xz
linux-f0d08f89ff27f7a600f21f443b6622132c9eb641.zip
OMAPDSS: DISPC: Change return type of dispc_mgr_set_clock_div()
dipsc_mgr_set_clock div has an int return type to report errors or success. The function doesn't really check for errors and always returns 0. Change the return type to void. Checking for the correct DISPC clock divider ranges will be done when a DSS2 user does a manager apply. This support will be added later. Signed-off-by: Archit Taneja <archit@ti.com>
Diffstat (limited to 'drivers/video/omap2/dss/dpi.c')
-rw-r--r--drivers/video/omap2/dss/dpi.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/video/omap2/dss/dpi.c b/drivers/video/omap2/dss/dpi.c
index a81b6d6deb57..bb0aad8e960a 100644
--- a/drivers/video/omap2/dss/dpi.c
+++ b/drivers/video/omap2/dss/dpi.c
@@ -83,11 +83,7 @@ static int dpi_set_dsi_clk(struct omap_dss_device *dssdev,
dss_select_dispc_clk_source(dssdev->clocks.dispc.dispc_fclk_src);
- r = dispc_mgr_set_clock_div(dssdev->manager->id, &dispc_cinfo);
- if (r) {
- dss_select_dispc_clk_source(OMAP_DSS_CLK_SRC_FCK);
- return r;
- }
+ dispc_mgr_set_clock_div(dssdev->manager->id, &dispc_cinfo);
*fck = dsi_cinfo.dsi_pll_hsdiv_dispc_clk;
*lck_div = dispc_cinfo.lck_div;
@@ -112,9 +108,7 @@ static int dpi_set_dispc_clk(struct omap_dss_device *dssdev,
if (r)
return r;
- r = dispc_mgr_set_clock_div(dssdev->manager->id, &dispc_cinfo);
- if (r)
- return r;
+ dispc_mgr_set_clock_div(dssdev->manager->id, &dispc_cinfo);
*fck = dss_cinfo.fck;
*lck_div = dispc_cinfo.lck_div;