mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "Rafael J. Wysocki" <rjw@sisk.pl>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Alan Stern <stern@rowland.harvard.edu>,
	David Brownell <david-b@pacbell.net>, Greg KH <greg@kroah.com>,
	LKML <linux-kernel@vger.kernel.org>, Pavel Machek <pavel@ucw.cz>
Subject: [PATCH -mm 4/7] PM: Remove suspend and resume support from struct device_type
Date: Wed, 13 Jun 2007 16:20:53 +0200	[thread overview]
Message-ID: <200706131620.54338.rjw@sisk.pl> (raw)
In-Reply-To: <200706131551.51336.rjw@sisk.pl>

From: Rafael J. Wysocki <rjw@sisk.pl>

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 <rjw@sisk.pl>
---
 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-mm2/drivers/base/power/resume.c
===================================================================
--- linux-2.6.22-rc4-mm2.orig/drivers/base/power/resume.c
+++ linux-2.6.22-rc4-mm2/drivers/base/power/resume.c
@@ -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-mm2/drivers/base/power/suspend.c
===================================================================
--- linux-2.6.22-rc4-mm2.orig/drivers/base/power/suspend.c
+++ linux-2.6.22-rc4-mm2/drivers/base/power/suspend.c
@@ -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-mm2/include/linux/device.h
===================================================================
--- linux-2.6.22-rc4-mm2.orig/include/linux/device.h
+++ linux-2.6.22-rc4-mm2/include/linux/device.h
@@ -340,8 +340,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 */


  parent reply	other threads:[~2007-06-13 21:30 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-06-13 13:51 [PATCH -mm 0/7] PM: Remove unused and unnecessary features from suspend and resume core Rafael J. Wysocki
2007-06-13 13:53 ` [PATCH -mm 1/7] PM: Remove pm_parent from struct dev_pm_info Rafael J. Wysocki
2007-06-13 13:55 ` [PATCH -mm 2/7] PM: Remove saved_state " Rafael J. Wysocki
2007-06-13 14:19 ` [PATCH -mm 3/7] PM: Simplify suspend_device Rafael J. Wysocki
2007-06-13 14:20 ` Rafael J. Wysocki [this message]
2007-06-13 22:20   ` [PATCH -mm 4/7] PM: Remove suspend and resume support from struct device_type Kay Sievers
2007-06-14  4:10     ` Dmitry Torokhov
2007-06-14 12:37       ` Rafael J. Wysocki
2007-06-14 12:59         ` Dmitry Torokhov
2007-06-14 17:46           ` Greg KH
2007-06-14 22:32             ` Rafael J. Wysocki
2007-06-14 22:50               ` Greg KH
2007-06-14 23:14               ` Greg KH
2007-06-14 23:30                 ` Rafael J. Wysocki
2007-06-17 17:46                 ` [PATCH -mm 0/3] PM: Remove unused and unnecessary features from core suspend code (continued) Rafael J. Wysocki
2007-06-17 17:48                   ` [PATCH -mm 1/3] PM: Remove prev_state from struct dev_pm_info Rafael J. Wysocki
2007-06-17 17:49                   ` [PATCH -mm 2/3] PM: Remove power_state.event checks from suspend core code Rafael J. Wysocki
2007-06-17 17:50                   ` [PATCH -mm 3/3] PM: Do not check parent state in suspend and resume " Rafael J. Wysocki
2007-06-14 14:19       ` [PATCH -mm 4/7] PM: Remove suspend and resume support from struct device_type David Brownell
2007-06-14 14:44         ` Dmitry Torokhov
2007-06-14 15:03           ` David Brownell
2007-06-14 15:17             ` Dmitry Torokhov
2007-06-13 15:16 ` [PATCH -mm 5/7] PM: Remove prev_state from struct dev_pm_info Rafael J. Wysocki
2007-06-13 15:16 ` [PATCH -mm 6/7] PM: Remove power_state.event checks from suspend core code Rafael J. Wysocki
2007-06-14 14:21   ` David Brownell
2007-06-14 22:46     ` Rafael J. Wysocki
2007-06-15  2:00       ` Alan Stern
2007-06-15 21:57         ` Rafael J. Wysocki
2007-06-17 19:26           ` Rafael J. Wysocki
2007-06-13 15:17 ` [PATCH -mm 7/7] PM: Do not check parent state in suspend and resume " Rafael J. Wysocki
2007-06-13 21:59 ` [PATCH -mm 0/7] PM: Remove unused and unnecessary features from suspend and resume core Greg KH
2007-06-13 23:02   ` Rafael J. Wysocki
2007-06-13 23:36 ` Pavel Machek

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=200706131620.54338.rjw@sisk.pl \
    --to=rjw@sisk.pl \
    --cc=akpm@linux-foundation.org \
    --cc=david-b@pacbell.net \
    --cc=greg@kroah.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=pavel@ucw.cz \
    --cc=stern@rowland.harvard.edu \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®