From patchwork Mon Jul 14 08:39:04 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Varka Bhadram X-Patchwork-Id: 369537 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 EBC791400B2 for ; Mon, 14 Jul 2014 18:42:51 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751602AbaGNIme (ORCPT ); Mon, 14 Jul 2014 04:42:34 -0400 Received: from mail-pa0-f41.google.com ([209.85.220.41]:44764 "EHLO mail-pa0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752915AbaGNIlE (ORCPT ); Mon, 14 Jul 2014 04:41:04 -0400 Received: by mail-pa0-f41.google.com with SMTP id fb1so4963247pad.14 for ; Mon, 14 Jul 2014 01:41:03 -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=ZjtzM7pe8IyltTznR1h+0EkIfY7Zfr7gEXyxGES6kU0=; b=GMi15vrpeaB6xVqdRhQr1CyJNfiJVdAWI5fz2ymuOOO6huxM8w16fOF3XAhTVIgMXk 8Tf8j6VjC9b6eoSrp5a0rtzHNjcRnZjzUhB2jlu9pecOUhVXKep8W6bhwAmh+yIVFfdn 4xV2fbiTi2VHdYd36OCLU1E2xjmPR+YV98nOAkmvxRHwMA0SRlWHeiZgzdzPUK3OHfeb h4/bmJO+M3R1oRtn/EcgdaQ+o96W2U+hEZ8ovvu02/3sJ8U2JFHICuB1TGhA0oV11bXe r+rZVSdn/5zlJUwL/T8BzrJig2btZStdKgb0Ene2Hnc9++xyBX+XLEiHnHZ0uSQudkbE Qj3g== X-Received: by 10.66.66.14 with SMTP id b14mr15501963pat.9.1405327263710; Mon, 14 Jul 2014 01:41:03 -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.40.59 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 14 Jul 2014 01:41:03 -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 1/6] ethernet: amd: move amd111e_remove_one after probe Date: Mon, 14 Jul 2014 14:09:04 +0530 Message-Id: <1405327149-6554-2-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 moves the remove functionalities after the probe so that we can see the registered and released resources properly. Every driver follows the same concept. Signed-off-by: Varka Bhadram --- drivers/net/ethernet/amd/amd8111e.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/drivers/net/ethernet/amd/amd8111e.c b/drivers/net/ethernet/amd/amd8111e.c index 068dc7c..ddd09e8 100644 --- a/drivers/net/ethernet/amd/amd8111e.c +++ b/drivers/net/ethernet/amd/amd8111e.c @@ -1701,18 +1701,6 @@ static int amd8111e_resume(struct pci_dev *pci_dev) return 0; } - -static void amd8111e_remove_one(struct pci_dev *pdev) -{ - struct net_device *dev = pci_get_drvdata(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); - } -} static void amd8111e_config_ipg(struct net_device* dev) { struct amd8111e_priv *lp = netdev_priv(dev); @@ -1970,6 +1958,19 @@ err_disable_pdev: } +static void amd8111e_remove_one(struct pci_dev *pdev) +{ + struct net_device *dev = pci_get_drvdata(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); + } +} + static struct pci_driver amd8111e_driver = { .name = MODULE_NAME, .id_table = amd8111e_pci_tbl,