Skip to content

Commit

Permalink
net: xilinx: emaclite: Remove xemaclite_remove_ndev()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Tobias Klauser authored and David S. Miller committed Jan 5, 2017
1 parent aa884a2 commit 60f9b5e
Showing 1 changed file with 2 additions and 16 deletions.
18 changes: 2 additions & 16 deletions drivers/net/ethernet/xilinx/xilinx_emaclite.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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;
}

Expand Down Expand Up @@ -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;
}
Expand Down

0 comments on commit 60f9b5e

Please sign in to comment.