diff options
| author |   Xu Wang <vulab@iscas.ac.cn> | 2020-11-04 06:45:05 +0000 |
|---|---|---|
| committer |   Tony Lindgren <tony@atomide.com> | 2020-11-19 11:45:42 +0200 |
| commit | e106698cbb901d9b74dea4c9a3b5a7e6598ae481 (patch) | |
| tree | 655ba9b68271785893f309d4821807b589a3c13c | |
| parent | ARM: OMAP2+: Remove redundant assignment to variable ret (diff) | |
| download | linux-dev-e106698cbb901d9b74dea4c9a3b5a7e6598ae481.tar.xz linux-dev-e106698cbb901d9b74dea4c9a3b5a7e6598ae481.zip | |
ARM: OMAP2+: Remove redundant null check before clk_prepare_enable/clk_disable_unprepare
Because clk_prepare_enable() and clk_disable_unprepare() already checked
NULL clock parameter, so the additional checks are unnecessary, just
remove them.
Signed-off-by: Xu Wang <vulab@iscas.ac.cn>
Signed-off-by: Tony Lindgren <tony@atomide.com>
| -rw-r--r-- | arch/arm/mach-omap2/display.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm/mach-omap2/display.c b/arch/arm/mach-omap2/display.c index 2000fca6bd4e..6daaa645ae5d 100644 --- a/arch/arm/mach-omap2/display.c +++ b/arch/arm/mach-omap2/display.c @@ -385,8 +385,7 @@ int omap_dss_reset(struct omap_hwmod *oh) } for (i = oh->opt_clks_cnt, oc = oh->opt_clks; i > 0; i--, oc++) - if (oc->_clk) - clk_prepare_enable(oc->_clk); + clk_prepare_enable(oc->_clk); dispc_disable_outputs(); @@ -412,8 +411,7 @@ int omap_dss_reset(struct omap_hwmod *oh) pr_debug("dss_core: softreset done\n"); for (i = oh->opt_clks_cnt, oc = oh->opt_clks; i > 0; i--, oc++) - if (oc->_clk) - clk_disable_unprepare(oc->_clk); + clk_disable_unprepare(oc->_clk); r = (c == MAX_MODULE_SOFTRESET_WAIT) ? -ETIMEDOUT : 0; |