Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754886AbXFKPCx (ORCPT ); Mon, 11 Jun 2007 11:02:53 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753343AbXFKPAm (ORCPT ); Mon, 11 Jun 2007 11:00:42 -0400 Received: from ogre.sisk.pl ([217.79.144.158]:38821 "EHLO ogre.sisk.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752351AbXFKPAd (ORCPT ); Mon, 11 Jun 2007 11:00:33 -0400 From: "Rafael J. Wysocki" To: pm list Subject: [RFC][PATCH -mm 6/7] PM: Remove power_state.event checks from suspend core code Date: Mon, 11 Jun 2007 17:04:40 +0200 User-Agent: KMail/1.9.5 Cc: Alan Stern , David Brownell , Greg KH , LKML , Pavel Machek , USB development list References: <200706111655.50022.rjw@sisk.pl> In-Reply-To: <200706111655.50022.rjw@sisk.pl> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-2" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200706111704.40924.rjw@sisk.pl> Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2202 Lines: 52 From: Rafael J. Wysocki The suspend routines should be called for every device during a system sleep transition, regardless of the device's state, so that drivers can regard these method calls as notifications that the system is about to go to sleep, rather than as directives to put their devices into the 'off' state. This is documented in Documentation/power/devices.txt and is already done in the core resume code, so it seems reasonable to make the core suspend code behave accordingly. Signed-off-by: Rafael J. Wysocki --- drivers/base/power/suspend.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) Index: linux-2.6.22-rc4/drivers/base/power/suspend.c =================================================================== --- linux-2.6.22-rc4.orig/drivers/base/power/suspend.c 2007-06-11 09:59:54.000000000 +0200 +++ linux-2.6.22-rc4/drivers/base/power/suspend.c 2007-06-11 10:18:11.000000000 +0200 @@ -71,14 +71,13 @@ int suspend_device(struct device * dev, dev->parent->power.power_state.event); } - if (dev->class && dev->class->suspend && !dev->power.power_state.event) { + if (dev->class && dev->class->suspend) { suspend_device_dbg(dev, state, "class "); error = dev->class->suspend(dev, state); suspend_report_result(dev->class->suspend, error); } - if (!error && dev->bus && dev->bus->suspend - && !dev->power.power_state.event) { + if (!error && dev->bus && dev->bus->suspend) { suspend_device_dbg(dev, state, ""); error = dev->bus->suspend(dev, state); suspend_report_result(dev->bus->suspend, error); @@ -97,8 +96,7 @@ static int suspend_device_late(struct de { int error = 0; - if (dev->bus && dev->bus->suspend_late - && !dev->power.power_state.event) { + if (dev->bus && dev->bus->suspend_late) { suspend_device_dbg(dev, state, "LATE "); error = dev->bus->suspend_late(dev, state); suspend_report_result(dev->bus->suspend_late, error); - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/