From patchwork Sat Feb 6 20:19:02 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Levitsky X-Patchwork-Id: 44729 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 CB634B7CBB for ; Sun, 7 Feb 2010 07:20:33 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932952Ab0BFUUD (ORCPT ); Sat, 6 Feb 2010 15:20:03 -0500 Received: from mail-fx0-f211.google.com ([209.85.220.211]:58911 "EHLO mail-fx0-f211.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756018Ab0BFUTU (ORCPT ); Sat, 6 Feb 2010 15:19:20 -0500 Received: by mail-fx0-f211.google.com with SMTP id 3so5633018fxm.39 for ; Sat, 06 Feb 2010 12:19:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer:in-reply-to:references; bh=X8bA+zk8GjNojm7+uGfxn5aHTxSmR8WSe5GrCMs1lms=; b=D5P/swZYeaJSNCWc7llsGahGDOLsGSpC5Gu6Du1H6Yt8p6CH/m7H2yVyR+okgDb7LA EmLkNGob/je5qyzHfxV2lPYYcLQG3ApujO+PjYSkncWdk1cDRJaoGYrOJfW04PJgueZ0 OlNMbazvnIj2OeCYlGHymazOAgNCWBcVJYOVM= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=bNaCNz9bL0FDq9vu+DnyQyHTSnQf9LTJ5navd2E9ZvIv2Md6NFLs+pD+aNcpewVffC Qld2IGEl++TwzQigwQcc+SvTOdSNE4I5Zssrv4YN4PfoUZ4j/4jtjRln7P1+N8YKeEJ3 pz3yRibz7d8e0FUJUztXiA+VlCeN5dm845UXI= Received: by 10.223.100.216 with SMTP id z24mr268447fan.5.1265487559513; Sat, 06 Feb 2010 12:19:19 -0800 (PST) Received: from localhost.localdomain (IGLD-84-229-248-49.inter.net.il [84.229.248.49]) by mx.google.com with ESMTPS id 15sm1194456fxm.6.2010.02.06.12.19.18 (version=SSLv3 cipher=RC4-MD5); Sat, 06 Feb 2010 12:19:19 -0800 (PST) From: Maxim Levitsky To: netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Maxim Levitsky Subject: [PATCH 6/6] DMFE: don't reinitialize the hardware if device wasn't open Date: Sat, 6 Feb 2010 22:19:02 +0200 Message-Id: <1265487542-4447-7-git-send-email-maximlevitsky@gmail.com> X-Mailer: git-send-email 1.6.3.3 In-Reply-To: <1265487542-4447-1-git-send-email-maximlevitsky@gmail.com> References: <1265487542-4447-1-git-send-email-maximlevitsky@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This cleans the .suspend/.resume functions and makes sure we don't enable the device if it was down before the suspend or disable it again if it was down in .suspend Signed-off-by: Maxim Levitsky --- drivers/net/tulip/dmfe.c | 21 +++++++-------------- 1 files changed, 7 insertions(+), 14 deletions(-) diff --git a/drivers/net/tulip/dmfe.c b/drivers/net/tulip/dmfe.c index 9cd6179..cf164de 100644 --- a/drivers/net/tulip/dmfe.c +++ b/drivers/net/tulip/dmfe.c @@ -1959,21 +1959,13 @@ static void __devexit dmfe_remove(struct pci_dev *pdev) static int dmfe_suspend(struct pci_dev *pci_dev, pm_message_t state) { struct net_device *dev = pci_get_drvdata(pci_dev); - struct dmfe_board_info *db = netdev_priv(dev); /* Disable upper layer interface */ netif_device_detach(dev); - /* Disable Tx/Rx */ - db->cr6_data &= ~(CR6_RXSC | CR6_TXSC); - dmfe_update_cr6(db->cr6_data, dev->base_addr); - - /* Disable Interrupt */ - outl(0, dev->base_addr + DCR7); - outl(inl(dev->base_addr + DCR5), dev->base_addr + DCR5); - - /* Fre RX buffers */ - dmfe_free_rxbuffer(db); + /* Stop the hardware */ + if (netif_running(dev)) + dmfe_stop(dev); /* Enable WOL */ dmfe_set_wol(dev, 1); @@ -1992,12 +1984,13 @@ static int dmfe_resume(struct pci_dev *pci_dev) pci_back_from_sleep(pci_dev); pci_restore_state(pci_dev); - /* Re-initilize DM910X board */ - dmfe_hardware_init(dev); - /* Disable WOL */ dmfe_set_wol(dev, 0); + /* Start the interace back */ + if (netif_running(dev)) + dmfe_open(dev); + /* Restart upper layer interface */ netif_device_attach(dev);