From patchwork Mon Jul 14 08:39:05 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Varka Bhadram X-Patchwork-Id: 369531 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 899BA14008F for ; Mon, 14 Jul 2014 18:41:22 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753620AbaGNIlQ (ORCPT ); Mon, 14 Jul 2014 04:41:16 -0400 Received: from mail-pa0-f45.google.com ([209.85.220.45]:32837 "EHLO mail-pa0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753280AbaGNIlI (ORCPT ); Mon, 14 Jul 2014 04:41:08 -0400 Received: by mail-pa0-f45.google.com with SMTP id rd3so5017929pab.32 for ; Mon, 14 Jul 2014 01:41:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=FlXeVZ+Jt36urvc812/XYnzmYtrSzRABor/w5mZOpKw=; b=ITK/PXxkl6z9HQZo6ZcaFxBLzGo/X54EMOHGulOytvwuuMAbj3bMo5qDRqkcsD64/e 5aFpRz6zY4HAEOhzUheSx5dTWX0kkiXOOrkLL1akZ4iq2iqEHTUUQHrcUGvemPeGSOIk 9MOJiSc7CEgbGI/4plUuzQ+hFmhtKSxW+a27c29cH5vJ9cDcR3ewWPu19inTDUCiuauZ kvfZagHAIXawo4KYeU35y4Gp6mJsh9YWD8c5/gyVKm8tWJtUOVIEiTbXpGW/We4URidx aYWxNwoulfkVBCRJQrjvWkxxBUiq4Rl8OFmYrA8RG6Hr2jLAg23408qzNUcF289EfoVT EAHw== X-Received: by 10.68.57.144 with SMTP id i16mr15561516pbq.48.1405327267925; Mon, 14 Jul 2014 01:41:07 -0700 (PDT) Received: from cdac.hyderabad.cdac.in ([196.12.45.164]) by mx.google.com with ESMTPSA id fe3sm10050458pbd.66.2014.07.14.01.41.03 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 14 Jul 2014 01:41:07 -0700 (PDT) From: varkabhadram@gmail.com To: netdev@vger.kernel.org Cc: Thomas.Lendacky@amd.com, geert+renesas@linux-m68k.org, ebiederm@xmission.com, macro@linux-mips.org, linux-kernel@vger.kernel.org, davem@davemloft.net, Varka Bhadram Subject: [PATCH net-next v3 2/6] ethernet: amd: use devm_ioremap() Date: Mon, 14 Jul 2014 14:09:05 +0530 Message-Id: <1405327149-6554-3-git-send-email-varkabhadram@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1405327149-6554-1-git-send-email-varkabhadram@gmail.com> References: <1405327149-6554-1-git-send-email-varkabhadram@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Varka Bhadram This patch replace ioremap() with the devm_ioremap() so that the resource will be freed automatically with the probe failed. Signed-off-by: Varka Bhadram --- drivers/net/ethernet/amd/amd8111e.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/amd/amd8111e.c b/drivers/net/ethernet/amd/amd8111e.c index ddd09e8..433107c 100644 --- a/drivers/net/ethernet/amd/amd8111e.c +++ b/drivers/net/ethernet/amd/amd8111e.c @@ -1866,7 +1866,7 @@ static int amd8111e_probe_one(struct pci_dev *pdev, spin_lock_init(&lp->lock); - lp->mmio = ioremap(reg_addr, reg_len); + lp->mmio = devm_ioremap(&pdev->dev, reg_addr, reg_len); if (!lp->mmio) { printk(KERN_ERR "amd8111e: Cannot map device registers, " "exiting\n"); @@ -1913,7 +1913,7 @@ static int amd8111e_probe_one(struct pci_dev *pdev, if (err) { printk(KERN_ERR "amd8111e: Cannot register net device, " "exiting.\n"); - goto err_iounmap; + goto err_free_dev; } pci_set_drvdata(pdev, dev); @@ -1943,8 +1943,6 @@ static int amd8111e_probe_one(struct pci_dev *pdev, printk(KERN_INFO "%s: Couldn't detect MII PHY, assuming address 0x01\n", dev->name); return 0; -err_iounmap: - iounmap(lp->mmio); err_free_dev: free_netdev(dev); @@ -1964,7 +1962,6 @@ static void amd8111e_remove_one(struct pci_dev *pdev) if (dev) { unregister_netdev(dev); - iounmap(((struct amd8111e_priv *)netdev_priv(dev))->mmio); free_netdev(dev); pci_release_regions(pdev); pci_disable_device(pdev);