diff options
author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2014-08-07 15:20:12 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-08-07 19:02:57 -0400 |
commit | 888c88b857cd974e65e6cacb0aece0dfdf9f27d1 (patch) | |
tree | ef7b3ed948f3a0c3822d904e8be4aeed118b4ffb /drivers/net | |
parent | e5a98fc25a4f688f01b073d9fe0bbccc7807ab8e (diff) |
net: gianfar: no need to check parameter being != NULL for of_node_put
of_node_put is a noop when being called with NULL.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/ethernet/freescale/gianfar.c | 12 |
1 files 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: | |||
1435 | unmap_group_regs(priv); | 1435 | unmap_group_regs(priv); |
1436 | gfar_free_rx_queues(priv); | 1436 | gfar_free_rx_queues(priv); |
1437 | gfar_free_tx_queues(priv); | 1437 | gfar_free_tx_queues(priv); |
1438 | if (priv->phy_node) | 1438 | of_node_put(priv->phy_node); |
1439 | of_node_put(priv->phy_node); | 1439 | of_node_put(priv->tbi_node); |
1440 | if (priv->tbi_node) | ||
1441 | of_node_put(priv->tbi_node); | ||
1442 | free_gfar_dev(priv); | 1440 | free_gfar_dev(priv); |
1443 | return err; | 1441 | return err; |
1444 | } | 1442 | } |
@@ -1447,10 +1445,8 @@ static int gfar_remove(struct platform_device *ofdev) | |||
1447 | { | 1445 | { |
1448 | struct gfar_private *priv = platform_get_drvdata(ofdev); | 1446 | struct gfar_private *priv = platform_get_drvdata(ofdev); |
1449 | 1447 | ||
1450 | if (priv->phy_node) | 1448 | of_node_put(priv->phy_node); |
1451 | of_node_put(priv->phy_node); | 1449 | of_node_put(priv->tbi_node); |
1452 | if (priv->tbi_node) | ||
1453 | of_node_put(priv->tbi_node); | ||
1454 | 1450 | ||
1455 | unregister_netdev(priv->ndev); | 1451 | unregister_netdev(priv->ndev); |
1456 | unmap_group_regs(priv); | 1452 | unmap_group_regs(priv); |