Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753169AbXFKPB5 (ORCPT ); Mon, 11 Jun 2007 11:01:57 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753160AbXFKPAj (ORCPT ); Mon, 11 Jun 2007 11:00:39 -0400 Received: from ogre.sisk.pl ([217.79.144.158]:38820 "EHLO ogre.sisk.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752170AbXFKPAc (ORCPT ); Mon, 11 Jun 2007 11:00:32 -0400 From: "Rafael J. Wysocki" To: pm list Subject: [RFC][PATCH -mm 4/7] PM: Remove suspend and resume support from struct device_type Date: Mon, 11 Jun 2007 17:01:44 +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: <200706111701.44988.rjw@sisk.pl> Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2680 Lines: 65 From: Rafael J. Wysocki The suspend and resume support in struct device_type (include/linux/device.h) is not used anywhere. It is also undocumented, so it can be removed. Signed-off-by: Rafael J. Wysocki --- drivers/base/power/resume.c | 5 ----- drivers/base/power/suspend.c | 7 ------- include/linux/device.h | 2 -- 3 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-10 15:00:23.000000000 +0200 +++ linux-2.6.22-rc4/drivers/base/power/resume.c 2007-06-10 15:02:04.000000000 +0200 @@ -41,11 +41,6 @@ int resume_device(struct device * dev) error = dev->bus->resume(dev); } - if (!error && dev->type && dev->type->resume) { - dev_dbg(dev,"resuming\n"); - error = dev->type->resume(dev); - } - if (!error && dev->class && dev->class->resume) { dev_dbg(dev,"class resume\n"); error = dev->class->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-10 15:00:40.000000000 +0200 +++ linux-2.6.22-rc4/drivers/base/power/suspend.c 2007-06-10 15:02:04.000000000 +0200 @@ -79,13 +79,6 @@ int suspend_device(struct device * dev, suspend_report_result(dev->class->suspend, error); } - if (!error && dev->type && dev->type->suspend - && !dev->power.power_state.event) { - suspend_device_dbg(dev, state, "type "); - error = dev->type->suspend(dev, state); - suspend_report_result(dev->type->suspend, error); - } - if (!error && dev->bus && dev->bus->suspend && !dev->power.power_state.event) { suspend_device_dbg(dev, state, ""); Index: linux-2.6.22-rc4/include/linux/device.h =================================================================== --- linux-2.6.22-rc4.orig/include/linux/device.h 2007-06-10 15:00:23.000000000 +0200 +++ linux-2.6.22-rc4/include/linux/device.h 2007-06-10 15:02:04.000000000 +0200 @@ -343,8 +343,6 @@ struct device_type { int (*uevent)(struct device *dev, char **envp, int num_envp, char *buffer, int buffer_size); void (*release)(struct device *dev); - int (*suspend)(struct device * dev, pm_message_t state); - int (*resume)(struct device * dev); }; /* interface for exporting device attributes */ - 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/