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
commit
d033a236bd
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Reference in New Issue