Skip to contentSkip to conversation

Suspend-related cleanups

PATCH Applied Rafael J. Wysocki 4 participants 15 messages Feb 3, 2008 – Feb 19, 2008

Subsystems (7)
Documentation ACPI PCI Driver core +3 more subsystems
lore
Share & tools
lore
#0 lore raw

cover Suspend-related cleanups

Hi,

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

Thanks,
Rafael

Signature · 1 line
"Premature optimization is the root of all evil." - Donald Knuth
#1 lore raw

PATCH 1/3 PCI ACPI: Fix comment describing acpi_pci_choose_state

From: Rafael J. Wysocki <[email protected]>

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

---
 drivers/pci/pci-acpi.c |    2 --
 1 file changed, 2 deletions(-)
drivers/pci/pci-acpi.c +0 -2
Index: 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,
#2 lore raw

PATCH 1/3 PCI ACPI: Fix comment describing acpi_pci_choose_state

In reply to Rafael J. Wysocki

From: Rafael J. Wysocki <[email protected]>

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

---
 drivers/pci/pci-acpi.c |    2 --
 1 file changed, 2 deletions(-)
drivers/pci/pci-acpi.c +0 -2
Index: 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,
#3 lore raw

PATCH 2/3 PM: Make suspend_device() static

In reply to Rafael J. Wysocki

From: Adrian Bunk <[email protected]>

suspend_device() can become static.

---
344fcfcea0df8cbaa83e10d7e66b826ead67290b

drivers/base/power/main.c +1 -1
index 200ed5f..cfcc54f 100644
@@ -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;
 
#4 lore raw

PATCH 2/3 PM: Make suspend_device() static

In reply to Rafael J. Wysocki

From: Adrian Bunk <[email protected]>

suspend_device() can become static.

---
344fcfcea0df8cbaa83e10d7e66b826ead67290b

drivers/base/power/main.c +1 -1
index 200ed5f..cfcc54f 100644
@@ -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;
 
#5 lore raw

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

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/

Quoted 1 line

From [email protected] Sun Feb 3 14:03:13 2008

From: Adrian Bunk <[email protected]>
Date: Sun, 3 Feb 2008 22:55:18 +0100
Subject: Driver core: PM: Make suspend_device() static
To: Len Brown <[email protected]>
Cc: ACPI Devel Maling List <[email protected]>, Pavel Machek <[email protected]>, pm list <[email protected]>, Greg KH <[email protected]>, Adrian Bunk <[email protected]>
Message-ID: <[email protected]>
Content-Disposition: inline

From: Adrian Bunk <[email protected]>

suspend_device() can become static.

---
 drivers/base/power/main.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/base/power/main.c +1 -1
@@ -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 [email protected] 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

#6 lore raw

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

In reply to Rafael J. Wysocki

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/

Quoted 1 line

From [email protected] Sun Feb 3 14:03:13 2008

From: Adrian Bunk <[email protected]>
Date: Sun, 3 Feb 2008 22:55:18 +0100
Subject: Driver core: PM: Make suspend_device() static
To: Len Brown <[email protected]>
Cc: ACPI Devel Maling List <[email protected]>, Pavel Machek <[email protected]>, pm list <[email protected]>, Greg KH <[email protected]>, Adrian Bunk <[email protected]>
Message-ID: <[email protected]>
Content-Disposition: inline

From: Adrian Bunk <[email protected]>

suspend_device() can become static.

---
 drivers/base/power/main.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/base/power/main.c +1 -1
@@ -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 [email protected] 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

#7 lore raw

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

In reply to Rafael J. Wysocki

From: Harvey Harrison <[email protected]>

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.]

---
 Documentation/feature-removal-schedule.txt |   25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
Documentation/feature-removal-schedule.txt +25 -0
Index: 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 <[email protected]>
+
+---------------------------
+
+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 <[email protected]>
+
+---------------------------
+
+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 <[email protected]>
+
+---------------------------
+
+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 <[email protected]>
+
+---------------------------
#8 lore raw

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

In reply to Rafael J. Wysocki

From: Harvey Harrison <[email protected]>

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.]

---
 Documentation/feature-removal-schedule.txt |   25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
Documentation/feature-removal-schedule.txt +25 -0
Index: 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 <[email protected]>
+
+---------------------------
+
+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 <[email protected]>
+
+---------------------------
+
+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 <[email protected]>
+
+---------------------------
+
+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 <[email protected]>
+
+---------------------------
#9 lore raw
In reply to Rafael J. Wysocki

Hi!

Quoted 1 line

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

Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
reviewer
#10 lore raw
Quoted 6 lines · Pavel Machek

Hi!

Quoted 1 line

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

reviewer
#11 lore raw
In reply to Pavel Machek
Quoted 6 lines · Pavel Machek

Hi!

Quoted 1 line

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

#12 lore raw
Quoted 9 lines · Len Brown
Quoted 6 lines · Pavel Machek

Hi!

Quoted 1 line

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.

Quoted 2 lines

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

#13 lore raw
In reply to Len Brown
Quoted 9 lines · Len Brown
Quoted 6 lines · Pavel Machek

Hi!

Quoted 1 line

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.

Quoted 2 lines

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

#14 lore raw
In reply to Rafael J. Wysocki

Hi!

Quoted 1 line

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

Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html