1
0
Fork 0

Merge branch 'net-Renesas-kill-redundant-checks'

Sergei Shtylyov says:

====================
Kill redundant checks in the Renesas Ethernet drivers

Here's a set of 2 patches against DaveM's 'net-next.git' repo removing
redundant checks in the driver probe() methods.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
hifive-unleashed-5.1
David S. Miller 2018-01-03 10:21:35 -05:00
commit d033a236bd
2 changed files with 2 additions and 4 deletions

View File

@ -2205,8 +2205,7 @@ out_dma_free:
if (chip_id != RCAR_GEN2)
ravb_ptp_stop(ndev);
out_release:
if (ndev)
free_netdev(ndev);
free_netdev(ndev);
pm_runtime_put(&pdev->dev);
pm_runtime_disable(&pdev->dev);

View File

@ -3282,8 +3282,7 @@ out_napi_del:
out_release:
/* net_dev free */
if (ndev)
free_netdev(ndev);
free_netdev(ndev);
pm_runtime_put(&pdev->dev);
pm_runtime_disable(&pdev->dev);