From patchwork Thu Sep 12 07:05:10 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 274447 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 872312C0396 for ; Thu, 12 Sep 2013 17:05:54 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755262Ab3ILHFQ (ORCPT ); Thu, 12 Sep 2013 03:05:16 -0400 Received: from mail-ee0-f48.google.com ([74.125.83.48]:44407 "EHLO mail-ee0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754166Ab3ILHFO (ORCPT ); Thu, 12 Sep 2013 03:05:14 -0400 Received: by mail-ee0-f48.google.com with SMTP id l10so5073931eei.21 for ; Thu, 12 Sep 2013 00:05:13 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :content-type; bh=xCmMRg/tE0uDxRly9+/dI5rsnRa0z4wzmvhNRxIUl7s=; b=QsfqOQjy4F5ZvLCYpsUdrN9BsgayyBuIBQ+Xuy2y+GJIaja+RmJjurs8ICJtbzfmkM TyHgAU84EHHbn7/E/Zg+5b9M6kd09EfiCuTgdpncqdB60wuD07xnJ09f64Vj80KRMQki WObPn9mDFt05VRK2xKMZU/+TwVVyyF2ZXmGcOmA5eryum33SeraWFG4oD3UO+AfCRgr6 DHHCOzgptLKlmUrk5lq3a/0m+IrZEj9MhAm8CFCHNZU9vPB5ZKvmcxJ9zApElmYDfjMv AANuxN3UrvYU3BFIwUis0VuQ/c4LpVPSD/jHAwGU09TJWKhRMz+F/YVJUrO0GmQwi0LM fd+A== X-Gm-Message-State: ALoCoQlheAjaoGamU6EB8lG5hC1twm8DZ3RL6990E2kv/rxnmLPrFAF5ULuHHjiY6C+CvLkvw1Fo X-Received: by 10.15.98.9 with SMTP id bi9mr429866eeb.67.1378969513628; Thu, 12 Sep 2013 00:05:13 -0700 (PDT) Received: from localhost (nat-63.starnet.cz. [178.255.168.63]) by mx.google.com with ESMTPSA id x47sm3143042eea.16.1969.12.31.16.00.00 (version=TLSv1.1 cipher=RC4-SHA bits=128/128); Thu, 12 Sep 2013 00:05:12 -0700 (PDT) From: Michal Simek To: netdev@vger.kernel.org Cc: Michal Simek , "David S. Miller" , Jens Renner , Libo Chen , Greg Kroah-Hartman , linux-kernel@vger.kernel.org Subject: [PATCH 1/2] net: emaclite: Not necessary to call devm_iounmap Date: Thu, 12 Sep 2013 09:05:10 +0200 Message-Id: <196d8368eee2d45eeeab40e96e2971f78ed8a79b.1378969499.git.michal.simek@xilinx.com> X-Mailer: git-send-email 1.8.2.3 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org devm_iounmap is called automatically. Signed-off-by: Michal Simek --- drivers/net/ethernet/xilinx/xilinx_emaclite.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) -- 1.8.2.3 diff --git a/drivers/net/ethernet/xilinx/xilinx_emaclite.c b/drivers/net/ethernet/xilinx/xilinx_emaclite.c index 4c619ea..de39098 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; }