Skip to contentSkip to conversation

PM: Remove legacy PM

PATCH In review Rafael J. Wysocki 6 participants 14 messages Mar 13, 2008 – Mar 15, 2008

Subsystems (6)
lore
Share & tools
lore
#0 lore raw

cover PM: Remove legacy PM

Hi Len,

The first of the following two patches removes the legacy PM infrastructure and the second one removes some of its remnants from the MIPS tree.

Please add them to the suspend branch.

Thanks,
Rafael

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

PATCH 1/2 PM: Remove legacy PM

From: Pavel Machek <[email protected]>

AFAICT pm_send_all is a nop when noone uses pm_register...

Hmm.. can we just force CONFIG_PM_LEGACY=n, and see what happens?

Or maybe this is better idea? It may break build somewhere, but it should be easy to fix... (it builds here, i386 and x86-64).

---
 arch/frv/kernel/pm.c            |    8 -
 arch/mips/au1000/common/power.c |   17 ---
 arch/x86/kernel/apm_32.c        |   15 --
 kernel/power/Kconfig            |   10 -
 kernel/power/Makefile           |    1 
 kernel/power/pm.c               |  205 ----------------------------------------
 6 files changed, 2 insertions(+), 254 deletions(-)
arch/frv/kernel/pm.c +0 -8
Index: linux-2.6/arch/frv/kernel/pm.c
===================================================================
@@ -163,14 +163,11 @@ static int sysctl_pm_do_suspend(ctl_tabl
 	if ((mode != 1) && (mode != 5))
 		return -EINVAL;
 
-	retval = pm_send_all(PM_SUSPEND, (void *)3);
-
 	if (retval == 0) {
 		if (mode == 5)
 		    retval = pm_do_bus_sleep();
 		else
 		    retval = pm_do_suspend();
-		pm_send_all(PM_RESUME, (void *)0);
 	}
 
 	return retval;
@@ -183,9 +180,6 @@ static int try_set_cmode(int new_cmode)
 	if (!(clock_cmodes_permitted & (1<<new_cmode)))
 		return -EINVAL;
 
-	/* tell all the drivers we're suspending */
-	pm_send_all(PM_SUSPEND, (void *)3);
-
 	/* now change cmode */
 	local_irq_disable();
 	frv_dma_pause_all();
@@ -201,8 +195,6 @@ static int try_set_cmode(int new_cmode)
 	frv_dma_resume_all();
 	local_irq_enable();
 
-	/* tell all the drivers we're resuming */
-	pm_send_all(PM_RESUME, (void *)0);
 	return 0;
 }
 
arch/mips/au1000/common/power.c +2 -15
Index: linux-2.6/arch/mips/au1000/common/power.c
===================================================================
@@ -258,7 +258,6 @@ int au_sleep(void)
 static int pm_do_sleep(ctl_table * ctl, int write, struct file *file,
 		       void __user *buffer, size_t * len, loff_t *ppos)
 {
-	int retval = 0;
 #ifdef SLEEP_TEST_TIMEOUT
 #define TMPBUFLEN2 16
 	char buf[TMPBUFLEN2], *p;
@@ -278,33 +277,21 @@ static int pm_do_sleep(ctl_table * ctl, 
 		p = buf;
 		sleep_ticks = simple_strtoul(p, &p, 0);
 #endif
-		retval = pm_send_all(PM_SUSPEND, (void *) 2);
-
-		if (retval)
-			return retval;
 
 		au_sleep();
-		retval = pm_send_all(PM_RESUME, (void *) 0);
 	}
-	return retval;
+	return 0;
 }
 
 static int pm_do_suspend(ctl_table * ctl, int write, struct file *file,
 			 void __user *buffer, size_t * len, loff_t *ppos)
 {
-	int retval = 0;
-
 	if (!write) {
 		*len = 0;
 	} else {
-		retval = pm_send_all(PM_SUSPEND, (void *) 2);
-		if (retval)
-			return retval;
 		suspend_mode = 1;
-
-		retval = pm_send_all(PM_RESUME, (void *) 0);
 	}
-	return retval;
+	return 0;
 }
 
 
arch/x86/kernel/apm_32.c +0 -15
Index: linux-2.6/arch/x86/kernel/apm_32.c
===================================================================
@@ -1189,19 +1189,6 @@ static int suspend(int vetoable)
 	int err;
 	struct apm_user	*as;
 
-	if (pm_send_all(PM_SUSPEND, (void *)3)) {
-		/* Vetoed */
-		if (vetoable) {
-			if (apm_info.connection_version > 0x100)
-				set_system_power_state(APM_STATE_REJECT);
-			err = -EBUSY;
-			ignore_sys_suspend = 0;
-			printk(KERN_WARNING "apm: suspend was vetoed.\n");
-			goto out;
-		}
-		printk(KERN_CRIT "apm: suspend was vetoed, but suspending anyway.\n");
-	}
-
 	device_suspend(PMSG_SUSPEND);
 	local_irq_disable();
 	device_power_down(PMSG_SUSPEND);
@@ -1224,7 +1211,6 @@ static int suspend(int vetoable)
 	device_power_up();
 	local_irq_enable();
 	device_resume();
-	pm_send_all(PM_RESUME, (void *)0);
 	queue_event(APM_NORMAL_RESUME, NULL);
  out:
 	spin_lock(&user_list_lock);
@@ -1337,7 +1323,6 @@ static void check_events(void)
 			if ((event != APM_NORMAL_RESUME)
 			    || (ignore_normal_resume == 0)) {
 				device_resume();
-				pm_send_all(PM_RESUME, (void *)0);
 				queue_event(event, NULL);
 			}
 			ignore_normal_resume = 0;
kernel/power/Kconfig +0 -10
Index: linux-2.6/kernel/power/Kconfig
===================================================================
@@ -19,16 +19,6 @@ config PM
 	  will issue the hlt instruction if nothing is to be done, thereby
 	  sending the processor to sleep and saving power.
 
-config PM_LEGACY
-	bool "Legacy Power Management API (DEPRECATED)"
-	depends on PM
-	default n
-	---help---
-	   Support for pm_register() and friends.  This old API is obsoleted
-	   by the driver model.
-
-	   If unsure, say N.
-
 config PM_DEBUG
 	bool "Power Management Debug Support"
 	depends on PM
kernel/power/Makefile +0 -1
Index: linux-2.6/kernel/power/Makefile
===================================================================
@@ -4,7 +4,6 @@ EXTRA_CFLAGS	+=	-DDEBUG
 endif
 
 obj-y				:= main.o
-obj-$(CONFIG_PM_LEGACY)		+= pm.o
 obj-$(CONFIG_PM_SLEEP)		+= process.o console.o
 obj-$(CONFIG_HIBERNATION)	+= swsusp.o disk.o snapshot.o swap.o user.o
 
kernel/power/pm.c deleted +0 -205

205 lines not on this page · raw message

#2 lore raw

PATCH 1/2 PM: Remove legacy PM

In reply to Rafael J. Wysocki

From: Pavel Machek <[email protected]>

AFAICT pm_send_all is a nop when noone uses pm_register...

Hmm.. can we just force CONFIG_PM_LEGACY=n, and see what happens?

Or maybe this is better idea? It may break build somewhere, but it should be easy to fix... (it builds here, i386 and x86-64).

---
 arch/frv/kernel/pm.c            |    8 -
 arch/mips/au1000/common/power.c |   17 ---
 arch/x86/kernel/apm_32.c        |   15 --
 kernel/power/Kconfig            |   10 -
 kernel/power/Makefile           |    1 
 kernel/power/pm.c               |  205 ----------------------------------------
 6 files changed, 2 insertions(+), 254 deletions(-)
arch/frv/kernel/pm.c +0 -8
Index: linux-2.6/arch/frv/kernel/pm.c
===================================================================
@@ -163,14 +163,11 @@ static int sysctl_pm_do_suspend(ctl_tabl
 	if ((mode != 1) && (mode != 5))
 		return -EINVAL;
 
-	retval = pm_send_all(PM_SUSPEND, (void *)3);
-
 	if (retval == 0) {
 		if (mode == 5)
 		    retval = pm_do_bus_sleep();
 		else
 		    retval = pm_do_suspend();
-		pm_send_all(PM_RESUME, (void *)0);
 	}
 
 	return retval;
@@ -183,9 +180,6 @@ static int try_set_cmode(int new_cmode)
 	if (!(clock_cmodes_permitted & (1<<new_cmode)))
 		return -EINVAL;
 
-	/* tell all the drivers we're suspending */
-	pm_send_all(PM_SUSPEND, (void *)3);
-
 	/* now change cmode */
 	local_irq_disable();
 	frv_dma_pause_all();
@@ -201,8 +195,6 @@ static int try_set_cmode(int new_cmode)
 	frv_dma_resume_all();
 	local_irq_enable();
 
-	/* tell all the drivers we're resuming */
-	pm_send_all(PM_RESUME, (void *)0);
 	return 0;
 }
 
arch/mips/au1000/common/power.c +2 -15
Index: linux-2.6/arch/mips/au1000/common/power.c
===================================================================
@@ -258,7 +258,6 @@ int au_sleep(void)
 static int pm_do_sleep(ctl_table * ctl, int write, struct file *file,
 		       void __user *buffer, size_t * len, loff_t *ppos)
 {
-	int retval = 0;
 #ifdef SLEEP_TEST_TIMEOUT
 #define TMPBUFLEN2 16
 	char buf[TMPBUFLEN2], *p;
@@ -278,33 +277,21 @@ static int pm_do_sleep(ctl_table * ctl, 
 		p = buf;
 		sleep_ticks = simple_strtoul(p, &p, 0);
 #endif
-		retval = pm_send_all(PM_SUSPEND, (void *) 2);
-
-		if (retval)
-			return retval;
 
 		au_sleep();
-		retval = pm_send_all(PM_RESUME, (void *) 0);
 	}
-	return retval;
+	return 0;
 }
 
 static int pm_do_suspend(ctl_table * ctl, int write, struct file *file,
 			 void __user *buffer, size_t * len, loff_t *ppos)
 {
-	int retval = 0;
-
 	if (!write) {
 		*len = 0;
 	} else {
-		retval = pm_send_all(PM_SUSPEND, (void *) 2);
-		if (retval)
-			return retval;
 		suspend_mode = 1;
-
-		retval = pm_send_all(PM_RESUME, (void *) 0);
 	}
-	return retval;
+	return 0;
 }
 
 
arch/x86/kernel/apm_32.c +0 -15
Index: linux-2.6/arch/x86/kernel/apm_32.c
===================================================================
@@ -1189,19 +1189,6 @@ static int suspend(int vetoable)
 	int err;
 	struct apm_user	*as;
 
-	if (pm_send_all(PM_SUSPEND, (void *)3)) {
-		/* Vetoed */
-		if (vetoable) {
-			if (apm_info.connection_version > 0x100)
-				set_system_power_state(APM_STATE_REJECT);
-			err = -EBUSY;
-			ignore_sys_suspend = 0;
-			printk(KERN_WARNING "apm: suspend was vetoed.\n");
-			goto out;
-		}
-		printk(KERN_CRIT "apm: suspend was vetoed, but suspending anyway.\n");
-	}
-
 	device_suspend(PMSG_SUSPEND);
 	local_irq_disable();
 	device_power_down(PMSG_SUSPEND);
@@ -1224,7 +1211,6 @@ static int suspend(int vetoable)
 	device_power_up();
 	local_irq_enable();
 	device_resume();
-	pm_send_all(PM_RESUME, (void *)0);
 	queue_event(APM_NORMAL_RESUME, NULL);
  out:
 	spin_lock(&user_list_lock);
@@ -1337,7 +1323,6 @@ static void check_events(void)
 			if ((event != APM_NORMAL_RESUME)
 			    || (ignore_normal_resume == 0)) {
 				device_resume();
-				pm_send_all(PM_RESUME, (void *)0);
 				queue_event(event, NULL);
 			}
 			ignore_normal_resume = 0;
kernel/power/Kconfig +0 -10
Index: linux-2.6/kernel/power/Kconfig
===================================================================
@@ -19,16 +19,6 @@ config PM
 	  will issue the hlt instruction if nothing is to be done, thereby
 	  sending the processor to sleep and saving power.
 
-config PM_LEGACY
-	bool "Legacy Power Management API (DEPRECATED)"
-	depends on PM
-	default n
-	---help---
-	   Support for pm_register() and friends.  This old API is obsoleted
-	   by the driver model.
-
-	   If unsure, say N.
-
 config PM_DEBUG
 	bool "Power Management Debug Support"
 	depends on PM
kernel/power/Makefile +0 -1
Index: linux-2.6/kernel/power/Makefile
===================================================================
@@ -4,7 +4,6 @@ EXTRA_CFLAGS	+=	-DDEBUG
 endif
 
 obj-y				:= main.o
-obj-$(CONFIG_PM_LEGACY)		+= pm.o
 obj-$(CONFIG_PM_SLEEP)		+= process.o console.o
 obj-$(CONFIG_HIBERNATION)	+= swsusp.o disk.o snapshot.o swap.o user.o
 
kernel/power/pm.c deleted +0 -205

205 lines not on this page · raw message

#3 lore raw

PATCH 2/2 MIPS Alchemy: Crapectomy after removal of pm_send_all calls.

In reply to Rafael J. Wysocki

From: Ralf Baechle <[email protected]>

[MIPS] Alchemy: Crapectomy after removal of pm_send_all calls.

---
 arch/mips/au1000/common/power.c |   20 --------------------
 1 file changed, 20 deletions(-)
arch/mips/au1000/common/power.c +0 -20
Index: linux-2.6/arch/mips/au1000/common/power.c
===================================================================
@@ -283,18 +283,6 @@ static int pm_do_sleep(ctl_table * ctl, 
 	return 0;
 }
 
-static int pm_do_suspend(ctl_table * ctl, int write, struct file *file,
-			 void __user *buffer, size_t * len, loff_t *ppos)
-{
-	if (!write) {
-		*len = 0;
-	} else {
-		suspend_mode = 1;
-	}
-	return 0;
-}
-
-
 static int pm_do_freq(ctl_table * ctl, int write, struct file *file,
 		      void __user *buffer, size_t * len, loff_t *ppos)
 {
@@ -408,14 +396,6 @@ static int pm_do_freq(ctl_table * ctl, i
 
 static struct ctl_table pm_table[] = {
 	{
-		.ctl_name 	= CTL_UNNUMBERED,
-		.procname	= "suspend",
-		.data		= NULL,
-		.maxlen		= 0,
-		.mode		= 0600,
-		.proc_handler	= &pm_do_suspend
-	},
-	{
 		.ctl_name	= CTL_UNNUMBERED,
 		.procname	= "sleep",
 		.data		= NULL,
#4 lore raw

PATCH 2/2 MIPS Alchemy: Crapectomy after removal of pm_send_all calls.

In reply to Rafael J. Wysocki

From: Ralf Baechle <[email protected]>

[MIPS] Alchemy: Crapectomy after removal of pm_send_all calls.

---
 arch/mips/au1000/common/power.c |   20 --------------------
 1 file changed, 20 deletions(-)
arch/mips/au1000/common/power.c +0 -20
Index: linux-2.6/arch/mips/au1000/common/power.c
===================================================================
@@ -283,18 +283,6 @@ static int pm_do_sleep(ctl_table * ctl, 
 	return 0;
 }
 
-static int pm_do_suspend(ctl_table * ctl, int write, struct file *file,
-			 void __user *buffer, size_t * len, loff_t *ppos)
-{
-	if (!write) {
-		*len = 0;
-	} else {
-		suspend_mode = 1;
-	}
-	return 0;
-}
-
-
 static int pm_do_freq(ctl_table * ctl, int write, struct file *file,
 		      void __user *buffer, size_t * len, loff_t *ppos)
 {
@@ -408,14 +396,6 @@ static int pm_do_freq(ctl_table * ctl, i
 
 static struct ctl_table pm_table[] = {
 	{
-		.ctl_name 	= CTL_UNNUMBERED,
-		.procname	= "suspend",
-		.data		= NULL,
-		.maxlen		= 0,
-		.mode		= 0600,
-		.proc_handler	= &pm_do_suspend
-	},
-	{
 		.ctl_name	= CTL_UNNUMBERED,
 		.procname	= "sleep",
 		.data		= NULL,
reviewer
#5 lore raw
In reply to Rafael J. Wysocki
Quoted 6 lines · Rafael J. Wysocki

Hi Len,

The first of the following two patches removes the legacy PM infrastructure and the second one removes some of its remnants from the MIPS tree.

Please add them to the suspend branch.

done.
and suspend branch is now rebased to latest linus

thanks,
-Len

reviewer
#6 lore raw
In reply to Rafael J. Wysocki
Quoted 6 lines · Rafael J. Wysocki

Hi Len,

The first of the following two patches removes the legacy PM infrastructure and the second one removes some of its remnants from the MIPS tree.

Please add them to the suspend branch.

done.
and suspend branch is now rebased to latest linus

thanks,
-Len

#7 lore raw

more [PATCH 0/2] PM: Remove legacy PM

On Fri, 14 Mar 2008 00:00:02 -0400 Len Brown wrote:

Please add this docbook patch.

---

From: Randy Dunlap <[email protected]>

Source file was removed. Need to remove docbook reference also.

Are there other files in kernel/power/ that should be added to the docbook?

$ power> kerndoc-search.pl --count *.c
file console.c: 0 kernel-doc blocks
file disk.c: 18 kernel-doc blocks
file main.c: 9 kernel-doc blocks
file poweroff.c: 0 kernel-doc blocks
file process.c: 2 kernel-doc blocks
file snapshot.c: 39 kernel-doc blocks
file swap.c: 10 kernel-doc blocks
file swsusp.c: 4 kernel-doc blocks
file user.c: 0 kernel-doc blocks
---
 Documentation/DocBook/kernel-api.tmpl |    5 -----
 1 file changed, 5 deletions(-)
Documentation/DocBook/kernel-api.tmpl +0 -5
@@ -297,11 +297,6 @@ X!Earch/x86/kernel/mca_32.c
 !Ikernel/acct.c
   </chapter>
 
-  <chapter id="pmfuncs">
-     <title>Power Management</title>
-!Ekernel/power/pm.c
-  </chapter>
-
   <chapter id="devdrivers">
      <title>Device drivers infrastructure</title>
      <sect1><title>Device Drivers Base</title>
#8 lore raw
In reply to Rafael J. Wysocki
Quoted 2 lines · Rafael J. Wysocki

The first of the following two patches removes the legacy PM infrastructure and the second one removes some of its remnants from the MIPS tree.

What does "legacy PM" mean? Is it APM, which most assuredly needs to remain?

#9 lore raw
In reply to Rafael J. Wysocki
Quoted 2 lines · Rafael J. Wysocki

The first of the following two patches removes the legacy PM infrastructure and the second one removes some of its remnants from the MIPS tree.

What does "legacy PM" mean? Is it APM, which most assuredly needs to remain?

#10 lore raw
Quoted 4 lines · David Newall
Quoted 2 lines

The first of the following two patches removes the legacy PM infrastructure and the second one removes some of its remnants from the MIPS tree.

What does "legacy PM" mean?

It's stuff that's so ancient nobody uses it any more... it's been deprecated over a year (f89bce3d9afc6b1fb898ae176df4962c1303ee86), and at that time only one ancient (Amiga?) driver even tried to use the notification scheme it provided.

Glad to see this finally go away!

- Dave

#11 lore raw
In reply to David Newall
Quoted 4 lines · David Newall
Quoted 2 lines

The first of the following two patches removes the legacy PM infrastructure and the second one removes some of its remnants from the MIPS tree.

What does "legacy PM" mean?

It's stuff that's so ancient nobody uses it any more... it's been deprecated over a year (f89bce3d9afc6b1fb898ae176df4962c1303ee86), and at that time only one ancient (Amiga?) driver even tried to use the notification scheme it provided.

Glad to see this finally go away!

- Dave

#12 lore raw
In reply to David Newall
Quoted 6 lines · David Newall
Quoted 2 lines · Rafael J. Wysocki

The first of the following two patches removes the legacy PM infrastructure and the second one removes some of its remnants from the MIPS tree.

What does "legacy PM" mean? Is it APM, which most assuredly needs to remain?

No, it is not APM. It issome obsolete code noone uses.
Pavel

Signature · 3 lines
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
pomozte zachranit klanovicky les:  http://www.ujezdskystrom.info/
#13 lore raw
In reply to David Newall
Quoted 6 lines · David Newall
Quoted 2 lines · Rafael J. Wysocki

The first of the following two patches removes the legacy PM infrastructure and the second one removes some of its remnants from the MIPS tree.

What does "legacy PM" mean? Is it APM, which most assuredly needs to remain?

No, it is not APM. It issome obsolete code noone uses.
Pavel

Signature · 3 lines
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
pomozte zachranit klanovicky les:  http://www.ujezdskystrom.info/