From patchwork Sat Feb 6 20:19:01 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Levitsky X-Patchwork-Id: 44731 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 E96A21007D1 for ; Sun, 7 Feb 2010 07:21:16 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756092Ab0BFUUo (ORCPT ); Sat, 6 Feb 2010 15:20:44 -0500 Received: from mail-fx0-f211.google.com ([209.85.220.211]:49234 "EHLO mail-fx0-f211.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756003Ab0BFUTT (ORCPT ); Sat, 6 Feb 2010 15:19:19 -0500 Received: by mail-fx0-f211.google.com with SMTP id 3so5632946fxm.39 for ; Sat, 06 Feb 2010 12:19:18 -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=jSxgqzIs+5sCdUdNq2yLwyqVF847RRikW1aVaE4kneU=; b=mBdSAFpCYwzOZEoHTj2wTOmRH+YzNpo7XjVUYJAsYbxx5DrQZDVDcPB4EQPPDGEmj9 R6WAkvx6OIyJUt6Dz+RcNTAqxZp3NHK+2B/1pAI1jiaJuaeW0a3rJ2d6fxOsTw9SB/Nu 8tFHKjlLwOFq99v1Zq8N3cDpmfNClly/gN/UQ= 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=P+KWokc9jpETUPHWM3eXYoJlqKQPJulMKUOAYZPTU3CIPCR+bO3NaJ+LJQUwftK6cX blk1xZEUW+lEOrmKZMJPGru1ltVTVsQ+ZurxkKuaoYtOUFcT1wJvcp9S2BuNFjzAnwJa pwLe2bgdpC8IwB9dbZ4F1sFngZ4OJV80y79aU= Received: by 10.87.36.30 with SMTP id o30mr8027871fgj.33.1265487558374; Sat, 06 Feb 2010 12:19:18 -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.17 (version=SSLv3 cipher=RC4-MD5); Sat, 06 Feb 2010 12:19:18 -0800 (PST) From: Maxim Levitsky To: netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Maxim Levitsky Subject: [PATCH 5/6] DMFE: add .shutdown Date: Sat, 6 Feb 2010 22:19:01 +0200 Message-Id: <1265487542-4447-6-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 fixes all kinds of problems, for example interrupt storms on following boot, WOL in S5, etc... Signed-off-by: Maxim Levitsky --- drivers/net/tulip/dmfe.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/net/tulip/dmfe.c b/drivers/net/tulip/dmfe.c index 44e1e5d..9cd6179 100644 --- a/drivers/net/tulip/dmfe.c +++ b/drivers/net/tulip/dmfe.c @@ -1956,7 +1956,6 @@ static void __devexit dmfe_remove(struct pci_dev *pdev) } -#ifdef CONFIG_PM static int dmfe_suspend(struct pci_dev *pci_dev, pm_message_t state) { struct net_device *dev = pci_get_drvdata(pci_dev); @@ -1985,6 +1984,7 @@ static int dmfe_suspend(struct pci_dev *pci_dev, pm_message_t state) return 0; } +#ifdef CONFIG_PM static int dmfe_resume(struct pci_dev *pci_dev) { struct net_device *dev = pci_get_drvdata(pci_dev); @@ -2006,6 +2006,11 @@ static int dmfe_resume(struct pci_dev *pci_dev) #endif +static void dmfe_shutdown(struct pci_dev *pci_dev) +{ + dmfe_suspend(pci_dev, PMSG_SUSPEND); +} + static struct pci_device_id dmfe_pci_tbl[] = { { PCI_VDEVICE(DAVICOM, PCI_DEVICE_ID_DAVICOM_DM9132) }, { PCI_VDEVICE(DAVICOM, PCI_DEVICE_ID_DAVICOM_DM9102) }, @@ -2023,8 +2028,9 @@ static struct pci_driver dmfe_driver = { .remove = __devexit_p(dmfe_remove), #ifdef CONFIG_PM .suspend = dmfe_suspend, - .resume = dmfe_resume + .resume = dmfe_resume, #endif + .shutdown = dmfe_shutdown, };