[PATCH 0/3] Suspend-related cleanups

[PATCH 0/3] Suspend-related cleanups

[Rafael J. Wysocki]

Hi,

Three suspend-related fixes that IMO can go into 2.6.25 follow.

Thanks,
Rafael


-- 
"Premature optimization is the root of all evil." - Donald Knuth

[PATCH 1/3] PCI ACPI: Fix comment describing acpi_pci_choose_state

[Rafael J. Wysocki]

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

The last line of the comment preceding the definition of
acpi_pci_choose_state() is incorrect.  Remove it.

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
---
 drivers/pci/pci-acpi.c |    2 --
 1 file changed, 2 deletions(-)

Index: linux-2.6/drivers/pci/pci-acpi.c
===================================================================
--- linux-2.6.orig/drivers/pci/pci-acpi.c
+++ linux-2.6/drivers/pci/pci-acpi.c
@@ -241,8 +241,6 @@ EXPORT_SYMBOL(pci_osc_control_set);
  *	choose from highest power _SxD to lowest power _SxW
  * else // no _PRW at S-state x
  * 	choose highest power _SxD or any lower power
- *
- * currently we simply return _SxD, if present.
  */
 
 static pci_power_t acpi_pci_choose_state(struct pci_dev *pdev,

[PATCH 2/3] PM: Make suspend_device() static

[Rafael J. Wysocki]

From: Adrian Bunk <bunk@kernel.org>

suspend_device() can become static.

Signed-off-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
---
344fcfcea0df8cbaa83e10d7e66b826ead67290b 
diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c
index 200ed5f..cfcc54f 100644
--- a/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
@@ -414,7 +414,7 @@ EXPORT_SYMBOL_GPL(device_power_down);
  *	@dev:	Device.
  *	@state:	Power state device is entering.
  */
-int suspend_device(struct device *dev, pm_message_t state)
+static int suspend_device(struct device *dev, pm_message_t state)
 {
 	int error = 0;
 

patch driver-core-pm-make-suspend_device-static.patch added to gregkh-2.6 tree

[gregkh]

This is a note to let you know that I've just added the patch titled

     Subject: Driver core: PM: Make suspend_device() static

to my gregkh-2.6 tree.  Its filename is

     driver-core-pm-make-suspend_device-static.patch

This tree can be found at 
    http://www.kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/patches/


>From rjw@sisk.pl Sun Feb  3 14:03:13 2008
From: Adrian Bunk <bunk@kernel.org>
Date: Sun, 3 Feb 2008 22:55:18 +0100
Subject: Driver core: PM: Make suspend_device() static
To: Len Brown <lenb@kernel.org>
Cc: ACPI Devel Maling List <linux-acpi@vger.kernel.org>, Pavel Machek <pavel@ucw.cz>, pm list <linux-pm@lists.linux-foundation.org>, Greg KH <greg@kroah.com>, Adrian Bunk <bunk@kernel.org>
Message-ID: <200802032255.19835.rjw@sisk.pl>
Content-Disposition: inline


From: Adrian Bunk <bunk@kernel.org>

suspend_device() can become static.

Signed-off-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---
 drivers/base/power/main.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
@@ -415,7 +415,7 @@ EXPORT_SYMBOL_GPL(device_power_down);
  *	@dev:	Device.
  *	@state:	Power state device is entering.
  */
-int suspend_device(struct device *dev, pm_message_t state)
+static int suspend_device(struct device *dev, pm_message_t state)
 {
 	int error = 0;
 


Patches currently in gregkh-2.6 which might be from bunk@kernel.org are

driver/driver-core-pm-make-suspend_device-static.patch
pci/pci-if-0-pci_assign_resource_fixed.patch
usb/usb-make-usb_storage_onetouch-available-with-pm.patch
usb/usb-g_printer-fix-empty-if-statement.patch

[PATCH 3/3] Documentation: Feature removal: Add deprecation of some hibernation ioctls

[Rafael J. Wysocki]

From: Harvey Harrison <harvey.harrison@gmail.com>

Let this appear as deprecated in 2.6.25, remove after three
releases (2.6.28).

[rjw: Say that I will be removing the features and give the
reason for the SNAPSHOT_SET_SWAP_FILE ioctl deprecation.]

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
---
 Documentation/feature-removal-schedule.txt |   25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

Index: linux-2.6/Documentation/feature-removal-schedule.txt
===================================================================
--- linux-2.6.orig/Documentation/feature-removal-schedule.txt
+++ linux-2.6/Documentation/feature-removal-schedule.txt
@@ -338,3 +338,28 @@ Why:	The support code for the old firmwa
 	and slightly hurts runtime performance. Bugfixes for the old firmware
 	are not provided by Broadcom anymore.
 Who:	Michael Buesch <mb@bu3sch.de>
+
+---------------------------
+
+What:	SNAPSHOT_PMOPS ioctl
+When:	2.6.28
+Why:	Badly designed interface, obsoleted by SNAPSHOT_PLATFORM_SUPPORT and
+	SNAPSHOT_POWER_OFF.
+Who:	Rafael J. Wysocki <rjw@sisk.pl>
+
+---------------------------
+
+What:	SNAPSHOT_SET_SWAP_FILE ioctl
+When:	2.6.28
+Why:	Obsoleted by SNAPSHOT_SET_SWAP_AREA which is more flexible.
+Who:	Rafael J. Wysocki <rjw@sisk.pl>
+
+---------------------------
+
+What:	SNAPSHOT_ATOMIC_SNAPSHOT, SNAPSHOT_AVAIL_SWAP, SNAPSHOT_GET_SWAP_PAGE ioctls
+When:	2.6.28
+Why:	Defined in a non-portable manner, new numbers introduced, old numbers
+	deprecated.
+Who:	Rafael J. Wysocki <rjw@sisk.pl>
+
+---------------------------

Re: [PATCH 0/3] Suspend-related cleanups

[Pavel Machek]

Hi!

> Three suspend-related fixes that IMO can go into 2.6.25 follow.

ACK on all three. Yes, these seem easy enough for 2.6.25.
									Pavel
-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

Re: [PATCH 0/3] Suspend-related cleanups

[Len Brown]

On Sunday 03 February 2008 17:20, Pavel Machek wrote:
> Hi!
> 
> > Three suspend-related fixes that IMO can go into 2.6.25 follow.
> 
> ACK on all three. Yes, these seem easy enough for 2.6.25.
> 									Pavel

1 & 2 applied.
lets re-send #3 after the big feature-removal patch goes in,
since it conflicts with top of tree and will conflict with that too.

thanks,
-Len

Re: [PATCH 0/3] Suspend-related cleanups

[Rafael J. Wysocki]

On Friday, 15 of February 2008, Len Brown wrote:
> On Sunday 03 February 2008 17:20, Pavel Machek wrote:
> > Hi!
> > 
> > > Three suspend-related fixes that IMO can go into 2.6.25 follow.
> > 
> > ACK on all three. Yes, these seem easy enough for 2.6.25.
> > 									Pavel
> 
> 1 & 2 applied.

Thanks.

> lets re-send #3 after the big feature-removal patch goes in,
> since it conflicts with top of tree and will conflict with that too.

Sure, I'll resend it.

Thanks,
Rafael