diff options
| author | Christophe JAILLET <christophe.jaillet@wanadoo.fr> | 2017-11-06 22:53:30 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-11-08 13:53:33 +0900 |
| commit | 336eac4347e74589f868e5da9ca0106953942aa8 (patch) | |
| tree | 54ab8bbac26c32ad4c7c972436bdecd020440c0e /drivers/net/ethernet/freescale/fman | |
| parent | 5adb55c92918225005873aaac5e6af36789bf0ad (diff) | |
| download | linux-336eac4347e74589f868e5da9ca0106953942aa8.tar.bz2 | |
fsl/fman: Remove some useless code
There is no need to release explicitly some devm_ allocated resources.
If the 'mac_probe()' probe function fails, they will be released
automatically, as already done in the other error handling paths of
this function.
Also goto '_return_of_get_parent' as in the other error handling paths.
This is useless (priv->fixed_link is NULL at this point), but at least
it is consistent.
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/freescale/fman')
| -rw-r--r-- | drivers/net/ethernet/freescale/fman/mac.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/net/ethernet/freescale/fman/mac.c b/drivers/net/ethernet/freescale/fman/mac.c index c27667a005f7..ca12e28129ed 100644 --- a/drivers/net/ethernet/freescale/fman/mac.c +++ b/drivers/net/ethernet/freescale/fman/mac.c @@ -709,11 +709,8 @@ static int mac_probe(struct platform_device *_of_dev) } if (!of_device_is_available(mac_node)) { - devm_iounmap(dev, priv->vaddr); - __devm_release_region(dev, fman_get_mem_region(priv->fman), - res.start, res.end + 1 - res.start); - devm_kfree(dev, mac_dev); - return -ENODEV; + err = -ENODEV; + goto _return_of_get_parent; } /* Get the cell-index */ |