| Message ID | 1599483723-43704-1-git-send-email-zhangchangzhong@huawei.com |
|---|---|
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
| Series | [net-next] net: xilinx: remove redundant null check before clk_disable_unprepare() | expand |
> -----Original Message----- > From: Zhang Changzhong <zhangchangzhong@huawei.com> > Sent: Monday, September 7, 2020 6:32 PM > To: Radhey Shyam Pandey <radheys@xilinx.com>; davem@davemloft.net; > kuba@kernel.org; Michal Simek <michals@xilinx.com> > Cc: netdev@vger.kernel.org; linux-kernel@vger.kernel.org > Subject: [PATCH net-next] net: xilinx: remove redundant null check before > 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. > > Reported-by: Hulk Robot <hulkci@huawei.com> > Signed-off-by: Zhang Changzhong <zhangchangzhong@huawei.com> Reviewed-by: Radhey Shyam Pandey <radhey.shyam.pandey@xilinx.com> Thanks! > --- > drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c > b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c > index fa5dc299..9aafd3e 100644 > --- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c > +++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c > @@ -2038,8 +2038,7 @@ static int axienet_remove(struct platform_device > *pdev) > > axienet_mdio_teardown(lp); > > - if (lp->clk) > - clk_disable_unprepare(lp->clk); > + clk_disable_unprepare(lp->clk); > > of_node_put(lp->phy_node); > lp->phy_node = NULL; > -- > 2.9.5
On Mon, 7 Sep 2020 13:14:05 +0000 Radhey Shyam Pandey wrote: > > From: Zhang Changzhong <zhangchangzhong@huawei.com> > > Sent: Monday, September 7, 2020 6:32 PM > > To: Radhey Shyam Pandey <radheys@xilinx.com>; davem@davemloft.net; > > kuba@kernel.org; Michal Simek <michals@xilinx.com> > > Cc: netdev@vger.kernel.org; linux-kernel@vger.kernel.org > > Subject: [PATCH net-next] net: xilinx: remove redundant null check before > > 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. > > > > Reported-by: Hulk Robot <hulkci@huawei.com> > > Signed-off-by: Zhang Changzhong <zhangchangzhong@huawei.com> > > Reviewed-by: Radhey Shyam Pandey <radhey.shyam.pandey@xilinx.com> Applied, thanks!
diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c index fa5dc299..9aafd3e 100644 --- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c +++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c @@ -2038,8 +2038,7 @@ static int axienet_remove(struct platform_device *pdev) axienet_mdio_teardown(lp); - if (lp->clk) - clk_disable_unprepare(lp->clk); + clk_disable_unprepare(lp->clk); of_node_put(lp->phy_node); lp->phy_node = NULL;
Because clk_prepare_enable() and clk_disable_unprepare() already checked NULL clock parameter, so the additional checks are unnecessary, just remove them. Reported-by: Hulk Robot <hulkci@huawei.com> Signed-off-by: Zhang Changzhong <zhangchangzhong@huawei.com> --- drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)