GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-26 00:21:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

can: mscan: simplify clock enable/disable

Browse source 
All the NULL checks are pointless, clk_*() routines already deal with
NULL just fine.

Signed-off-by: Zhang Changzhong <zhangchangzhong@huawei.com>
Link: https://lore.kernel.org/r/1594972875-27631-1-git-send-email-zhangchangzhong@huawei.com
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
This commit is contained in:
Zhang Changzhong 2020-07-17 16:01:15 +08:00 • committed by Marc Kleine-Budde
parent 01fb4254e1
commit b2527eb271
1 changed files with 10 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

28
drivers/net/can/mscan/mscan.c
View file

@ -541,16 +541,12 @@ static int mscan_open(struct net_device *dev)
struct mscan_priv *priv = netdev_priv(dev); struct mscan_priv *priv = netdev_priv(dev);
struct mscan_regs __iomem *regs = priv->reg_base; struct mscan_regs __iomem *regs = priv->reg_base;
if (priv->clk_ipg) { ret = clk_prepare_enable(priv->clk_ipg);
ret = clk_prepare_enable(priv->clk_ipg); if (ret)
if (ret) goto exit_retcode;
goto exit_retcode; ret = clk_prepare_enable(priv->clk_can);
} if (ret)
if (priv->clk_can) { goto exit_dis_ipg_clock;
ret = clk_prepare_enable(priv->clk_can);
if (ret)
goto exit_dis_ipg_clock;
}
/* common open */ /* common open */
ret = open_candev(dev); ret = open_candev(dev);
@ -584,11 +580,9 @@ exit_napi_disable:
napi_disable(&priv->napi); napi_disable(&priv->napi);
close_candev(dev); close_candev(dev);
exit_dis_can_clock: exit_dis_can_clock:
if (priv->clk_can) clk_disable_unprepare(priv->clk_can);
clk_disable_unprepare(priv->clk_can);
exit_dis_ipg_clock: exit_dis_ipg_clock:
if (priv->clk_ipg) clk_disable_unprepare(priv->clk_ipg);
clk_disable_unprepare(priv->clk_ipg);
exit_retcode: exit_retcode:
return ret; return ret;
} }
@ -607,10 +601,8 @@ static int mscan_close(struct net_device *dev)
close_candev(dev); close_candev(dev);
free_irq(dev->irq, dev); free_irq(dev->irq, dev);
if (priv->clk_can) clk_disable_unprepare(priv->clk_can);
clk_disable_unprepare(priv->clk_can); clk_disable_unprepare(priv->clk_ipg);
if (priv->clk_ipg)
clk_disable_unprepare(priv->clk_ipg);
return 0; return 0;
} }