提交 d033a236 编写于 作者: D David S. Miller

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: NDavid S. Miller <davem@davemloft.net>
......@@ -2205,8 +2205,7 @@ static int ravb_probe(struct platform_device *pdev)
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 @@ static int sh_eth_drv_probe(struct platform_device *pdev)
out_release:
/* net_dev free */
if (ndev)
free_netdev(ndev);
free_netdev(ndev);
pm_runtime_put(&pdev->dev);
pm_runtime_disable(&pdev->dev);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册