Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760605AbXFQSKx (ORCPT ); Sun, 17 Jun 2007 14:10:53 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756354AbXFQSJq (ORCPT ); Sun, 17 Jun 2007 14:09:46 -0400 Received: from ogre.sisk.pl ([217.79.144.158]:34038 "EHLO ogre.sisk.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754101AbXFQSJo (ORCPT ); Sun, 17 Jun 2007 14:09:44 -0400 From: "Rafael J. Wysocki" To: Greg KH Subject: [PATCH -mm 3/3] PM: Do not check parent state in suspend and resume core code Date: Sun, 17 Jun 2007 19:50:51 +0200 User-Agent: KMail/1.9.5 Cc: Dmitry Torokhov , Kay Sievers , Andrew Morton , Alan Stern , David Brownell , LKML , Pavel Machek References: <200706131551.51336.rjw@sisk.pl> <20070614231402.GA6317@kroah.com> <200706171946.26174.rjw@sisk.pl> In-Reply-To: <200706171946.26174.rjw@sisk.pl> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200706171950.52354.rjw@sisk.pl> Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2557 Lines: 60 From: Rafael J. Wysocki The checks if the device's parent is in the right state done in drivers/base/power/suspend.c and drivers/base/power/resume.c serve no particular purpose, since if the parent is in a wrong power state, the device's suspend or resume callbacks are supposed to return an error anyway. Moreover, they are also useless from the sanity checking point of view, because they rely on the code being checked to set dev->parent->power.power_state.event appropriately, which need not happen if that code is buggy. For these reasons they can be removed. Signed-off-by: Rafael J. Wysocki Acked-by: David Brownell --- drivers/base/power/resume.c | 7 ------- drivers/base/power/suspend.c | 7 ------- 2 files changed, 14 deletions(-) Index: linux-2.6.22-rc4/drivers/base/power/resume.c =================================================================== --- linux-2.6.22-rc4.orig/drivers/base/power/resume.c 2007-06-16 01:08:13.000000000 +0200 +++ linux-2.6.22-rc4/drivers/base/power/resume.c 2007-06-16 01:12:53.000000000 +0200 @@ -29,13 +29,6 @@ int resume_device(struct device * dev) down(&dev->sem); - if (dev->parent && dev->parent->power.power_state.event) { - dev_err(dev, "PM: resume from %d, parent %s still %d\n", - dev->power.power_state.event, - dev->parent->bus_id, - dev->parent->power.power_state.event); - } - if (dev->bus && dev->bus->resume) { dev_dbg(dev,"resuming\n"); error = dev->bus->resume(dev); Index: linux-2.6.22-rc4/drivers/base/power/suspend.c =================================================================== --- linux-2.6.22-rc4.orig/drivers/base/power/suspend.c 2007-06-16 01:12:04.000000000 +0200 +++ linux-2.6.22-rc4/drivers/base/power/suspend.c 2007-06-16 01:12:53.000000000 +0200 @@ -63,13 +63,6 @@ int suspend_device(struct device * dev, dev_dbg(dev, "PM: suspend %d-->%d\n", dev->power.power_state.event, state.event); } - if (dev->parent && dev->parent->power.power_state.event) { - dev_err(dev, - "PM: suspend %d->%d, parent %s already %d\n", - dev->power.power_state.event, state.event, - dev->parent->bus_id, - dev->parent->power.power_state.event); - } if (dev->class && dev->class->suspend) { suspend_device_dbg(dev, state, "class "); - 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/