| Message ID | 1407492475-26283-2-git-send-email-Julia.Lawall@lip6.fr (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 08/08/2014 12:07 PM, Julia Lawall wrote: > From: Julia Lawall <Julia.Lawall@lip6.fr> > > Of_node_put supports NULL as its argument, so the initial test is not > necessary. > > Suggested by Uwe Kleine-König. > > The semantic patch that fixes this problem is as follows: > (http://coccinelle.lip6.fr/) > > // <smpl> > @@ > expression e; > @@ > > -if (e) > of_node_put(e); > // </smpl> > > Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr> > > --- > 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 7b0a735..30e8608 100644 > --- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c > +++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c > @@ -1630,8 +1630,7 @@ static int axienet_of_remove(struct platform_device *op) > axienet_mdio_teardown(lp); > unregister_netdev(ndev); > > - if (lp->phy_node) > - of_node_put(lp->phy_node); > + of_node_put(lp->phy_node); > lp->phy_node = NULL; > > iounmap(lp->regs); > Reviewed-by: Michal Simek <michal.simek@xilinx.com> Thanks, Michal
From: Julia Lawall <Julia.Lawall@lip6.fr> Date: Fri, 8 Aug 2014 12:07:43 +0200 > From: Julia Lawall <Julia.Lawall@lip6.fr> > > Of_node_put supports NULL as its argument, so the initial test is not > necessary. > > Suggested by Uwe Kleine-König. > > The semantic patch that fixes this problem is as follows: > (http://coccinelle.lip6.fr/) ... > Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr> Applied.
diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c index 7b0a735..30e8608 100644 --- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c +++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c @@ -1630,8 +1630,7 @@ static int axienet_of_remove(struct platform_device *op) axienet_mdio_teardown(lp); unregister_netdev(ndev); - if (lp->phy_node) - of_node_put(lp->phy_node); + of_node_put(lp->phy_node); lp->phy_node = NULL; iounmap(lp->regs);