| From d06fa8fb32fbcea7f449009d6907fe860a7c9148 Mon Sep 17 00:00:00 2001 |
| From: Michal Simek <michal.simek@xilinx.com> |
| Date: Thu, 12 Sep 2013 09:05:10 +0200 |
| Subject: net: emaclite: Not necessary to call devm_iounmap |
| |
| devm_iounmap is called automatically. |
| |
| Signed-off-by: Michal Simek <michal.simek@xilinx.com> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| (cherry picked from commit 37c67c6e2bb5b8f287d92e543acb0f8fa41af0e9) |
| Signed-off-by: Daniel Sangorrin <daniel.sangorrin@toshiba.co.jp> |
| Signed-off-by: Yoshitake Kobayashi <yoshitake.kobayashi@toshiba.co.jp> |
| --- |
| drivers/net/ethernet/xilinx/xilinx_emaclite.c | 11 +++-------- |
| 1 file changed, 3 insertions(+), 8 deletions(-) |
| |
| diff --git a/drivers/net/ethernet/xilinx/xilinx_emaclite.c b/drivers/net/ethernet/xilinx/xilinx_emaclite.c |
| index 4c619ea5189f..de3909878f42 100644 |
| --- a/drivers/net/ethernet/xilinx/xilinx_emaclite.c |
| +++ b/drivers/net/ethernet/xilinx/xilinx_emaclite.c |
| @@ -1075,14 +1075,9 @@ static int xemaclite_send(struct sk_buff *orig_skb, struct net_device *dev) |
| * 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, |
| - struct platform_device *pdev) |
| +static void xemaclite_remove_ndev(struct net_device *ndev) |
| { |
| if (ndev) { |
| - struct net_local *lp = netdev_priv(ndev); |
| - |
| - if (lp->base_addr) |
| - devm_iounmap(&pdev->dev, lp->base_addr); |
| free_netdev(ndev); |
| } |
| } |
| @@ -1214,7 +1209,7 @@ static int xemaclite_of_probe(struct platform_device *ofdev) |
| return 0; |
| |
| error: |
| - xemaclite_remove_ndev(ndev, ofdev); |
| + xemaclite_remove_ndev(ndev); |
| return rc; |
| } |
| |
| @@ -1248,7 +1243,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, of_dev); |
| + xemaclite_remove_ndev(ndev); |
| |
| return 0; |
| } |
| -- |
| 1.8.5.rc3 |
| |
