From patchwork Wed May 12 23:30:01 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike McCormack X-Patchwork-Id: 52416 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 4E4F9B7D89 for ; Thu, 13 May 2010 09:39:10 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755134Ab0ELXjF (ORCPT ); Wed, 12 May 2010 19:39:05 -0400 Received: from mail-pw0-f46.google.com ([209.85.160.46]:40587 "EHLO mail-pw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753147Ab0ELXjC (ORCPT ); Wed, 12 May 2010 19:39:02 -0400 Received: by mail-pw0-f46.google.com with SMTP id 5so332350pwi.19 for ; Wed, 12 May 2010 16:39:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:sender:message-id:date:from :user-agent:mime-version:to:cc:subject:content-type :content-transfer-encoding; bh=z6NGWhDKOau+T0spIKUgJ4IyAGDjN8UvUynNISTHGRA=; b=tmvk4I5yI4PVLL9BGLZAnjvSLgxPcFtqtYUzZkZAThUsg+4m6WLoaLLYf5OzlLgO5G tgkKxtzCLWsRdMKVtizA6mIKrS3MZDayJADD6sqgoqeuzaUkpWVT/b6t4Ssw+iRwxAO5 XyArukkC5mVdRC8loPJ+fgqxJlK4F9aiLscp4= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:message-id:date:from:user-agent:mime-version:to:cc:subject :content-type:content-transfer-encoding; b=hSnNW2a5M2yYOM/yNY3tlFktkcAv/JzcMFglR9pLAhNj2Oyk7FI7dHr2zXxqX78IPS fd+GS4goQg4RTt8GeKDQs1XQlLGP0m7A0V5WuWPdU87ZOJcAB9xhqxpv4jwcMEetiF6P WJzTJNZ6dOCGhkeXaIS7UkP9iTIAunwqFQKCs= Received: by 10.141.105.16 with SMTP id h16mr5513827rvm.274.1273707542130; Wed, 12 May 2010 16:39:02 -0700 (PDT) Received: from [192.168.0.103] ([121.168.21.96]) by mx.google.com with ESMTPS id l29sm549618rvb.16.2010.05.12.16.39.01 (version=SSLv3 cipher=RC4-MD5); Wed, 12 May 2010 16:39:01 -0700 (PDT) Message-ID: <4BEB39F9.9090004@ring3k.org> Date: Thu, 13 May 2010 08:30:01 +0900 From: Mike McCormack User-Agent: Mozilla-Thunderbird 2.0.0.24 (X11/20100328) MIME-Version: 1.0 To: Stephen Hemminger CC: netdev@vger.kernel.org Subject: [PATCH 5/5] sky2: Avoid allocating memory in sky2_resume Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Allocating memory can fail, and since we have the memory we need in sky2_resume when sky2_suspend is called, just stop the hardware without freeing the memory it's using. This avoids the possibility of failing because we can't allocate memory in sky2_resume(), and allows sharing code with sky2_restart(). Signed-off-by: Mike McCormack --- drivers/net/sky2.c | 20 +++++--------------- 1 files changed, 5 insertions(+), 15 deletions(-) diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c index a8060c8..02d9d6f 100644 --- a/drivers/net/sky2.c +++ b/drivers/net/sky2.c @@ -4842,12 +4842,12 @@ static int sky2_suspend(struct pci_dev *pdev, pm_message_t state) cancel_work_sync(&hw->restart_work); rtnl_lock(); + + sky2_all_down(hw); for (i = 0; i < hw->ports; i++) { struct net_device *dev = hw->dev[i]; struct sky2_port *sky2 = netdev_priv(dev); - sky2_detach(dev); - if (sky2->wol) sky2_wol_init(sky2); @@ -4856,8 +4856,6 @@ static int sky2_suspend(struct pci_dev *pdev, pm_message_t state) device_set_wakeup_enable(&pdev->dev, wol != 0); - sky2_write32(hw, B0_IMSK, 0); - napi_disable(&hw->napi); sky2_power_aux(hw); rtnl_unlock(); @@ -4872,12 +4870,11 @@ static int sky2_suspend(struct pci_dev *pdev, pm_message_t state) static int sky2_resume(struct pci_dev *pdev) { struct sky2_hw *hw = pci_get_drvdata(pdev); - int i, err; + int err; if (!hw) return 0; - rtnl_lock(); err = pci_set_power_state(pdev, PCI_D0); if (err) goto out; @@ -4895,20 +4892,13 @@ static int sky2_resume(struct pci_dev *pdev) goto out; } + rtnl_lock(); sky2_reset(hw); - sky2_write32(hw, B0_IMSK, Y2_IS_BASE); - napi_enable(&hw->napi); - - for (i = 0; i < hw->ports; i++) { - err = sky2_reattach(hw->dev[i]); - if (err) - goto out; - } + sky2_all_up(hw); rtnl_unlock(); return 0; out: - rtnl_unlock(); dev_err(&pdev->dev, "resume failed (%d)\n", err); pci_disable_device(pdev);