leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net: xilinx: emaclite: Remove xemaclite_remove_ndev()

Browse Source 
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: Tobias Klauser <tklauser@distanz.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Tobias Klauser 2017-01-05 10:41:36 +01:00 committed by David S. Miller
parent aa884a26a1
commit 60f9b5e806
1 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/net/ethernet/xilinx/xilinx_emaclite.c
View File

@ -1028,20 +1028,6 @@ static int xemaclite_send(struct sk_buff *orig_skb, struct net_device *dev)
return 0; 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 * get_bool - Get a parameter from the OF device
* @ofdev: Pointer to OF device structure * @ofdev: Pointer to OF device structure
@ -1172,7 +1158,7 @@ static int xemaclite_of_probe(struct platform_device *ofdev)
return 0; return 0;
error: error:
xemaclite_remove_ndev(ndev); free_netdev(ndev);
return rc; return rc;
} }
@ -1204,7 +1190,7 @@ static int xemaclite_of_remove(struct platform_device *of_dev)
of_node_put(lp->phy_node); of_node_put(lp->phy_node);
lp->phy_node = NULL; lp->phy_node = NULL;
xemaclite_remove_ndev(ndev); free_netdev(ndev);
return 0; return 0;
} }