提交 60f9b5e8 编写于 作者: T Tobias Klauser 提交者: David S. Miller

net: xilinx: emaclite: Remove xemaclite_remove_ndev()

xemaclite_remove_ndev() is a simple wrapper around free_netdev()
checking for NULL before the call. All possible paths calling
it are guaranteed to pass a non-NULL argument, so rather call
free_netdev() directly.
Signed-off-by: NTobias Klauser <tklauser@distanz.ch>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 aa884a26
无相关合并请求
......@@ -1028,20 +1028,6 @@ static int xemaclite_send(struct sk_buff *orig_skb, struct net_device *dev)
return 0;
}
/**
* xemaclite_remove_ndev - Free the network device
* @ndev: Pointer to the network device to be freed
*
* This function un maps the IO region of the Emaclite device and frees the net
* device.
*/
static void xemaclite_remove_ndev(struct net_device *ndev)
{
if (ndev) {
free_netdev(ndev);
}
}
/**
* get_bool - Get a parameter from the OF device
* @ofdev: Pointer to OF device structure
......@@ -1172,7 +1158,7 @@ static int xemaclite_of_probe(struct platform_device *ofdev)
return 0;
error:
xemaclite_remove_ndev(ndev);
free_netdev(ndev);
return rc;
}
......@@ -1204,7 +1190,7 @@ static int xemaclite_of_remove(struct platform_device *of_dev)
of_node_put(lp->phy_node);
lp->phy_node = NULL;
xemaclite_remove_ndev(ndev);
free_netdev(ndev);
return 0;
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册
反馈
建议
客服 返回
顶部