[2.6 patch] remove include/linux/pm_legacy.h

[2.6 patch] remove include/linux/pm_legacy.h

[Adrian Bunk]

This patch removes the obsolete and no longer used 
include/linux/pm_legacy.h

Reported-by: Robert P. J. Day <rpjday@crashcourse.ca>
Signed-off-by: Adrian Bunk <bunk@kernel.org>

---

BTW: arch/arm/mach-sa1100/h3600.c:h3800_pm_callback() still tries to 
     handle PM_{SUSPEND,RESUME}, but that's not touched by this patch.

 arch/frv/kernel/pm.c            |    1 
 arch/mips/au1000/common/power.c |    1 
 arch/x86/kernel/apm_32.c        |    1 
 include/linux/pm_legacy.h       |   35 --------------------------------
 4 files changed, 38 deletions(-)

b72cb105a5c8e961825b6ec9558c7c7ab4c18070 diff --git a/arch/frv/kernel/pm.c b/arch/frv/kernel/pm.c
index 73f3aee..d1113c5 100644
--- a/arch/frv/kernel/pm.c
+++ b/arch/frv/kernel/pm.c
@@ -14,7 +14,6 @@
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/pm.h>
-#include <linux/pm_legacy.h>
 #include <linux/sched.h>
 #include <linux/interrupt.h>
 #include <linux/sysctl.h>
diff --git a/arch/mips/au1000/common/power.c b/arch/mips/au1000/common/power.c
index 2166b9e..bd854a6 100644
--- a/arch/mips/au1000/common/power.c
+++ b/arch/mips/au1000/common/power.c
@@ -31,7 +31,6 @@
 
 #include <linux/init.h>
 #include <linux/pm.h>
-#include <linux/pm_legacy.h>
 #include <linux/sysctl.h>
 #include <linux/jiffies.h>
 
diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c
index bf9290e..fa1f3be 100644
--- a/arch/x86/kernel/apm_32.c
+++ b/arch/x86/kernel/apm_32.c
@@ -218,7 +218,6 @@
 #include <linux/time.h>
 #include <linux/sched.h>
 #include <linux/pm.h>
-#include <linux/pm_legacy.h>
 #include <linux/capability.h>
 #include <linux/device.h>
 #include <linux/kernel.h>
diff --git a/include/linux/pm_legacy.h b/include/linux/pm_legacy.h
deleted file mode 100644
index 446f4f4..0000000
--- a/include/linux/pm_legacy.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#ifndef __LINUX_PM_LEGACY_H__
-#define __LINUX_PM_LEGACY_H__
-
-
-#ifdef CONFIG_PM_LEGACY
-
-/*
- * Register a device with power management
- */
-struct pm_dev __deprecated *
-pm_register(pm_dev_t type, unsigned long id, pm_callback callback);
-
-/*
- * Send a request to all devices
- */
-int __deprecated pm_send_all(pm_request_t rqst, void *data);
-
-#else /* CONFIG_PM_LEGACY */
-
-static inline struct pm_dev *pm_register(pm_dev_t type,
-					 unsigned long id,
-					 pm_callback callback)
-{
-	return NULL;
-}
-
-static inline int pm_send_all(pm_request_t rqst, void *data)
-{
-	return 0;
-}
-
-#endif /* CONFIG_PM_LEGACY */
-
-#endif /* __LINUX_PM_LEGACY_H__ */
-

Re: [2.6 patch] remove include/linux/pm_legacy.h

[Rafael J. Wysocki]

On Thursday, 5 of June 2008, Adrian Bunk wrote:
> This patch removes the obsolete and no longer used 
> include/linux/pm_legacy.h
> 
> Reported-by: Robert P. J. Day <rpjday@crashcourse.ca>
> Signed-off-by: Adrian Bunk <bunk@kernel.org>

Acked-by: Rafael J. Wysocki <rjw@sisk.pl>


> ---
> 
> BTW: arch/arm/mach-sa1100/h3600.c:h3800_pm_callback() still tries to 
>      handle PM_{SUSPEND,RESUME}, but that's not touched by this patch.
> 
>  arch/frv/kernel/pm.c            |    1 
>  arch/mips/au1000/common/power.c |    1 
>  arch/x86/kernel/apm_32.c        |    1 
>  include/linux/pm_legacy.h       |   35 --------------------------------
>  4 files changed, 38 deletions(-)
> 
> b72cb105a5c8e961825b6ec9558c7c7ab4c18070 diff --git a/arch/frv/kernel/pm.c b/arch/frv/kernel/pm.c
> index 73f3aee..d1113c5 100644
> --- a/arch/frv/kernel/pm.c
> +++ b/arch/frv/kernel/pm.c
> @@ -14,7 +14,6 @@
>  #include <linux/init.h>
>  #include <linux/module.h>
>  #include <linux/pm.h>
> -#include <linux/pm_legacy.h>
>  #include <linux/sched.h>
>  #include <linux/interrupt.h>
>  #include <linux/sysctl.h>
> diff --git a/arch/mips/au1000/common/power.c b/arch/mips/au1000/common/power.c
> index 2166b9e..bd854a6 100644
> --- a/arch/mips/au1000/common/power.c
> +++ b/arch/mips/au1000/common/power.c
> @@ -31,7 +31,6 @@
>  
>  #include <linux/init.h>
>  #include <linux/pm.h>
> -#include <linux/pm_legacy.h>
>  #include <linux/sysctl.h>
>  #include <linux/jiffies.h>
>  
> diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c
> index bf9290e..fa1f3be 100644
> --- a/arch/x86/kernel/apm_32.c
> +++ b/arch/x86/kernel/apm_32.c
> @@ -218,7 +218,6 @@
>  #include <linux/time.h>
>  #include <linux/sched.h>
>  #include <linux/pm.h>
> -#include <linux/pm_legacy.h>
>  #include <linux/capability.h>
>  #include <linux/device.h>
>  #include <linux/kernel.h>
> diff --git a/include/linux/pm_legacy.h b/include/linux/pm_legacy.h
> deleted file mode 100644
> index 446f4f4..0000000
> --- a/include/linux/pm_legacy.h
> +++ /dev/null
> @@ -1,35 +0,0 @@
> -#ifndef __LINUX_PM_LEGACY_H__
> -#define __LINUX_PM_LEGACY_H__
> -
> -
> -#ifdef CONFIG_PM_LEGACY
> -
> -/*
> - * Register a device with power management
> - */
> -struct pm_dev __deprecated *
> -pm_register(pm_dev_t type, unsigned long id, pm_callback callback);
> -
> -/*
> - * Send a request to all devices
> - */
> -int __deprecated pm_send_all(pm_request_t rqst, void *data);
> -
> -#else /* CONFIG_PM_LEGACY */
> -
> -static inline struct pm_dev *pm_register(pm_dev_t type,
> -					 unsigned long id,
> -					 pm_callback callback)
> -{
> -	return NULL;
> -}
> -
> -static inline int pm_send_all(pm_request_t rqst, void *data)
> -{
> -	return 0;
> -}
> -
> -#endif /* CONFIG_PM_LEGACY */
> -
> -#endif /* __LINUX_PM_LEGACY_H__ */
> -
> 
> 
> 



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