From patchwork Tue Jan 29 04:34:16 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Huang, Ying" X-Patchwork-Id: 2059101 Return-Path: X-Original-To: patchwork-linux-acpi@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 42A303FCD5 for ; Tue, 29 Jan 2013 04:35:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756667Ab3A2Eed (ORCPT ); Mon, 28 Jan 2013 23:34:33 -0500 Received: from mga02.intel.com ([134.134.136.20]:65168 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756622Ab3A2Eeb (ORCPT ); Mon, 28 Jan 2013 23:34:31 -0500 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga101.jf.intel.com with ESMTP; 28 Jan 2013 20:34:25 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.84,556,1355126400"; d="scan'208";a="253942319" Received: from yhuang-dev.sh.intel.com ([10.239.13.18]) by orsmga001.jf.intel.com with ESMTP; 28 Jan 2013 20:34:23 -0800 From: Huang Ying To: Bjorn Helgaas Cc: linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, linux-pm@vger.kernel.org, linux-acpi@vger.kernel.org, "Rafael J. Wysocki" , Huang Ying Subject: [PATCH 2/4] PCI: Rename pci_dev->runtime_d3cold to pci_dev->set_d3cold Date: Tue, 29 Jan 2013 12:34:16 +0800 Message-Id: <1359434058-15918-3-git-send-email-ying.huang@intel.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1359434058-15918-1-git-send-email-ying.huang@intel.com> References: <1359434058-15918-1-git-send-email-ying.huang@intel.com> Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org Will use this flag for system suspend in addition to runtime suspend. Signed-off-by: Huang Ying --- drivers/pci/pci-driver.c | 2 +- drivers/pci/pci.c | 6 +++--- include/linux/pci.h | 7 +++---- 3 files changed, 7 insertions(+), 8 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html --- a/drivers/pci/pci-driver.c +++ b/drivers/pci/pci-driver.c @@ -1036,7 +1036,7 @@ static int pci_pm_runtime_resume(struct rc = pm->runtime_resume(dev); - pci_dev->runtime_d3cold = false; + pci_dev->set_d3cold = false; return rc; } --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -681,7 +681,7 @@ static void __pci_start_power_transition * devices powered on/off by corresponding bridge, * because have already delayed for the bridge. */ - if (dev->runtime_d3cold) { + if (dev->set_d3cold) { msleep(dev->d3cold_delay); /* * When powering on a bridge from D3cold, the @@ -1833,7 +1833,7 @@ int pci_finish_runtime_suspend(struct pc if (target_state == PCI_POWER_ERROR) return -EIO; - dev->runtime_d3cold = target_state == PCI_D3cold; + dev->set_d3cold = target_state == PCI_D3cold; __pci_enable_wake(dev, target_state, true, pci_dev_run_wake(dev)); @@ -1841,7 +1841,7 @@ int pci_finish_runtime_suspend(struct pc if (error) { __pci_enable_wake(dev, target_state, true, false); - dev->runtime_d3cold = false; + dev->set_d3cold = false; } return error; --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -263,10 +263,9 @@ struct pci_dev { unsigned int mmio_always_on:1; /* disallow turning off io/mem decoding during bar sizing */ unsigned int wakeup_prepared:1; - unsigned int runtime_d3cold:1; /* whether go through runtime - D3cold, not set for devices - powered on/off by the - corresponding bridge */ + unsigned int set_d3cold:1; /* whether go through runtime D3cold, + not set for devices powered on/off + by the corresponding bridge */ unsigned int d3_delay; /* D3->D0 transition time in ms */ unsigned int d3cold_delay; /* D3cold->D0 transition time in ms */