| Message ID | 1407439212-16661-1-git-send-email-u.kleine-koenig@pengutronix.de |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On Thu, 7 Aug 2014, Uwe Kleine-König wrote: > of_node_put is a noop when being called with NULL. > > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> > --- > Hello, > > @Julia: I'm sure it's easy to create a coccinelle rule for this. @@ expression e; @@ -if (e) of_node_put(e); It matches in 25 files. julia > > Best regards > Uwe > > drivers/net/ethernet/freescale/gianfar.c | 12 ++++-------- > 1 file changed, 4 insertions(+), 8 deletions(-) > > diff --git a/drivers/net/ethernet/freescale/gianfar.c b/drivers/net/ethernet/freescale/gianfar.c > index a6cf40e62f3a..6b0c4775cd0d 100644 > --- a/drivers/net/ethernet/freescale/gianfar.c > +++ b/drivers/net/ethernet/freescale/gianfar.c > @@ -1435,10 +1435,8 @@ register_fail: > unmap_group_regs(priv); > gfar_free_rx_queues(priv); > gfar_free_tx_queues(priv); > - if (priv->phy_node) > - of_node_put(priv->phy_node); > - if (priv->tbi_node) > - of_node_put(priv->tbi_node); > + of_node_put(priv->phy_node); > + of_node_put(priv->tbi_node); > free_gfar_dev(priv); > return err; > } > @@ -1447,10 +1445,8 @@ static int gfar_remove(struct platform_device *ofdev) > { > struct gfar_private *priv = platform_get_drvdata(ofdev); > > - if (priv->phy_node) > - of_node_put(priv->phy_node); > - if (priv->tbi_node) > - of_node_put(priv->tbi_node); > + of_node_put(priv->phy_node); > + of_node_put(priv->tbi_node); > > unregister_netdev(priv->ndev); > unmap_group_regs(priv); > -- > 2.0.1 > >
From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Date: Thu, 7 Aug 2014 21:20:12 +0200 > of_node_put is a noop when being called with NULL. > > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Applied. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/ethernet/freescale/gianfar.c b/drivers/net/ethernet/freescale/gianfar.c index a6cf40e62f3a..6b0c4775cd0d 100644 --- a/drivers/net/ethernet/freescale/gianfar.c +++ b/drivers/net/ethernet/freescale/gianfar.c @@ -1435,10 +1435,8 @@ register_fail: unmap_group_regs(priv); gfar_free_rx_queues(priv); gfar_free_tx_queues(priv); - if (priv->phy_node) - of_node_put(priv->phy_node); - if (priv->tbi_node) - of_node_put(priv->tbi_node); + of_node_put(priv->phy_node); + of_node_put(priv->tbi_node); free_gfar_dev(priv); return err; } @@ -1447,10 +1445,8 @@ static int gfar_remove(struct platform_device *ofdev) { struct gfar_private *priv = platform_get_drvdata(ofdev); - if (priv->phy_node) - of_node_put(priv->phy_node); - if (priv->tbi_node) - of_node_put(priv->tbi_node); + of_node_put(priv->phy_node); + of_node_put(priv->tbi_node); unregister_netdev(priv->ndev); unmap_group_regs(priv);
of_node_put is a noop when being called with NULL. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> --- Hello, @Julia: I'm sure it's easy to create a coccinelle rule for this. Best regards Uwe drivers/net/ethernet/freescale/gianfar.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)