move pm_register/etc. to CONFIG_PM_LEGACY, pm_legacy.h
Subsystems (9)
PATCH 1/1 move pm_register/etc. to CONFIG_PM_LEGACY, pm_legacy.h
Since few people need the support anymore, this moves the legacy pm_xxx functions to CONFIG_PM_LEGACY, and include/linux/pm_legacy.h.
arch/arm/kernel/apm.c | 1 arch/frv/kernel/pm.c | 1 arch/i386/Kconfig | 2 - arch/i386/kernel/apm.c | 1 arch/mips/au1000/common/power.c | 1 drivers/acpi/bus.c | 3 +- drivers/mtd/mtdcore.c | 9 ++++--- drivers/net/3c509.c | 13 +++++----- drivers/net/irda/ali-ircc.c | 1 drivers/net/irda/nsc-ircc.c | 1 drivers/serial/68328serial.c | 7 +++-- include/linux/pm.h | 49 ---------------------------------------- kernel/power/Kconfig | 9 +++++++ kernel/power/Makefile | 3 +- kernel/power/pm.c | 1 sound/oss/ad1848.c | 1 sound/oss/cs4281/cs4281m.c | 1 sound/oss/maestro.c | 1 sound/oss/nm256_audio.c | 1 sound/oss/opl3sa2.c | 18 ++++++++------ 25 files changed, 52 insertions(+), 74 deletions(-)
arch/arm/kernel/apm.c +1 -0
@@ -20,6 +20,7 @@#include <linux/apm_bios.h> #include <linux/sched.h> #include <linux/pm.h> +#include <linux/pm_legacy.h> #include <linux/device.h> #include <linux/kernel.h> #include <linux/list.h>
arch/frv/kernel/pm.c +1 -0
@@ -14,6 +14,7 @@#include <linux/config.h> #include <linux/init.h> #include <linux/pm.h> +#include <linux/pm_legacy.h> #include <linux/sched.h> #include <linux/interrupt.h> #include <linux/sysctl.h>
arch/i386/Kconfig +1 -1
@@ -699,7 +699,7 @@ depends on PM && !X86_VISWS config APM tristate "APM (Advanced Power Management) BIOS support" - depends on PM + depends on PM && PM_LEGACY ---help--- APM is a BIOS specification for saving power using several different techniques. This is mostly useful for battery powered laptops with
arch/i386/kernel/apm.c +1 -0
@@ -218,6 +218,7 @@#include <linux/time.h> #include <linux/sched.h> #include <linux/pm.h> +#include <linux/pm_legacy.h> #include <linux/device.h> #include <linux/kernel.h> #include <linux/smp.h>
arch/mips/au1000/common/power.c +1 -0
@@ -32,6 +32,7 @@#include <linux/config.h> #include <linux/init.h> #include <linux/pm.h> +#include <linux/pm_legacy.h> #include <linux/slab.h> #include <linux/sysctl.h> #include <linux/jiffies.h>
drivers/acpi/bus.c +2 -1
@@ -28,6 +28,7 @@#include <linux/list.h> #include <linux/sched.h> #include <linux/pm.h> +#include <linux/pm_legacy.h> #include <linux/device.h> #include <linux/proc_fs.h> #ifdef CONFIG_X86
@@ -754,7 +755,7 @@ static int __init acpi_init(void) result =acpi_bus_init ();if (!result) { -#ifdef CONFIG_PM +#ifdef CONFIG_PM_LEGACY if (!PM_IS_ACTIVE ()) pm_active =1 ;else {
drivers/mtd/mtdcore.c +5 -4
@@ -299,9 +299,10 @@ EXPORT_SYMBOL(default_mtd_readv);/*====================================================================*/ /* Power management code */ -#ifdef CONFIG_PM +#ifdef CONFIG_PM_LEGACY #include <linux/pm.h> +#include <linux/pm_legacy.h> static struct pm_dev *mtd_pm_dev =NULL ;
@@ -327,7 +328,7 @@ static int mtd_pm_callback(struct pm_devup (&mtd_table_mutex); return ret; } -#endif +#endif /* CONFIG_PM_LEGACY */ /*====================================================================*/ /* Support for /proc/mtd */
@@ -389,7 +390,7 @@ static int __init init_mtd(void) proc_mtd->read_proc = mtd_read_proc;#endif -#ifdef CONFIG_PM +#ifdef CONFIG_PM_LEGACY mtd_pm_dev =pm_register (PM_UNKNOWN_DEV ,0 , mtd_pm_callback);#endif return 0 ;
@@ -397,7 +398,7 @@ static int __init init_mtd(void) static void __exit cleanup_mtd(void) { -#ifdef CONFIG_PM +#ifdef CONFIG_PM_LEGACY if (mtd_pm_dev) {pm_unregister (mtd_pm_dev); mtd_pm_dev =NULL ;
drivers/net/3c509.c +7 -6
@@ -84,6 +84,7 @@ static int max_interrupt_work = 10;#include <linux/netdevice.h> #include <linux/etherdevice.h> #include <linux/pm.h> +#include <linux/pm_legacy.h> #include <linux/skbuff.h> #include <linux/delay.h> /* for udelay() */ #include <linux/spinlock.h>
@@ -173,7 +174,7 @@ struct el3_private {/* skb send-queue */ int head, size;struct sk_buff *queue[SKB_QUEUE_SIZE ]; -#ifdef CONFIG_PM +#ifdef CONFIG_PM_LEGACY struct pm_dev *pmdev;#endif enum {
@@ -200,7 +201,7 @@ static void el3_tx_timeout (struct net_dstatic void el3_down (struct net_device *dev);static void el3_up (struct net_device *dev);static struct ethtool_ops ethtool_ops; -#ifdef CONFIG_PM +#ifdef CONFIG_PM_LEGACY static int el3_suspend (struct pm_dev *pdev);static int el3_resume (struct pm_dev *pdev);static int el3_pm_callback (struct pm_dev *pdev,pm_request_t rqst,void *data);
@@ -361,7 +362,7 @@ static void el3_common_remove (struct nestruct el3_private *lp =netdev_priv (dev); (void ) lp;/* Keep gcc quiet... */ -#ifdef CONFIG_PM +#ifdef CONFIG_PM_LEGACY if (lp->pmdev)pm_unregister (lp->pmdev);#endif
@@ -571,7 +572,7 @@ no_pnp:if (err) goto out1; -#ifdef CONFIG_PM +#ifdef CONFIG_PM_LEGACY /* register power management */ lp->pmdev =pm_register (PM_ISA_DEV , card_idx, el3_pm_callback);if (lp->pmdev) {
@@ -1479,7 +1480,7 @@ el3_up(struct net_device *dev) }/* Power Management support functions */ -#ifdef CONFIG_PM +#ifdef CONFIG_PM_LEGACY static int el3_suspend (struct pm_dev *pdev)
@@ -1548,7 +1549,7 @@ el3_pm_callback(struct pm_dev *pdev, pm_ return 0; } -#endif /* CONFIG_PM */ +#endif /* CONFIG_PM_LEGACY */ /* Parameters that may be passed into the module. */ static int debug =-1 ;
drivers/net/irda/Kconfig +0 -0
drivers/net/irda/ali-ircc.c +1 -0
@@ -40,6 +40,7 @@#include <asm/byteorder.h> #include <linux/pm.h> +#include <linux/pm_legacy.h> #include <net/irda/wrapper.h> #include <net/irda/irda.h>
drivers/net/irda/nsc-ircc.c +1 -0
@@ -59,6 +59,7 @@#include <asm/byteorder.h> #include <linux/pm.h> +#include <linux/pm_legacy.h> #include <net/irda/wrapper.h> #include <net/irda/irda.h>
drivers/serial/68328serial.c +4 -3
@@ -34,6 +34,7 @@#include <linux/keyboard.h> #include <linux/init.h> #include <linux/pm.h> +#include <linux/pm_legacy.h> #include <linux/bitops.h> #include <linux/delay.h>
@@ -1343,7 +1344,7 @@ static void show_serial_version(void)printk ("MC68328 serial driver version 1.00\n" ); } -#ifdef CONFIG_PM +#ifdef CONFIG_PM_LEGACY /* Serial Power management * The console (currently fixed at line 0) is a special case for power * management because the kernel is so chatty. The console will be
@@ -1393,7 +1394,7 @@ void startup_console(void)struct m68k_serial *info = &m68k_soft[0 ];startup (info); } -#endif +#endif /* CONFIG_PM_LEGACY */ static struct tty_operations rs_ops = {
@@ -1486,7 +1487,7 @@ rs68328_init(void) IRQ_FLG_STD, "M68328_UART", NULL))panic ("Unable to attach 68328 serial interrupt\n" ); -#ifdef CONFIG_PM +#ifdef CONFIG_PM_LEGACY serial_pm[i] =pm_register (PM_SYS_DEV ,PM_SYS_COM , serial_pm_callback);if (serial_pm[i]) serial_pm[i]->data = info;
include/linux/pm.h +0 -49
55 lines not on this page · raw message
kernel/power/Kconfig +9 -0
@@ -19,6 +19,15 @@ 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" + depends on PM + default y + ---help--- + Support for pm_register() and friends. + + If unsure, say Y. + config PM_DEBUG bool "Power Management Debug Support" depends on PM
kernel/power/Makefile +2 -1
@@ -3,7 +3,8 @@ ifeq ($(CONFIG_PM_DEBUG),y) EXTRA_CFLAGS += -DDEBUG endif -obj-y := main.o process.o console.o pm.o +obj-y := main.o process.o console.o +obj-$(CONFIG_PM_LEGACY) += pm.o obj-$(CONFIG_SOFTWARE_SUSPEND) += swsusp.o disk.o snapshot.o obj-$(CONFIG_SUSPEND_SMP) += smp.o
kernel/power/pm.c +1 -0
@@ -23,6 +23,7 @@#include <linux/mm.h> #include <linux/slab.h> #include <linux/pm.h> +#include <linux/pm_legacy.h> #include <linux/interrupt.h> int pm_active;
sound/oss/Kconfig +0 -0
sound/oss/ad1848.c +1 -0
@@ -47,6 +47,7 @@#include <linux/module.h> #include <linux/stddef.h> #include <linux/pm.h> +#include <linux/pm_legacy.h> #include <linux/isapnp.h> #include <linux/pnp.h> #include <linux/spinlock.h>
sound/oss/cs4281/cs4281m.c +1 -0
@@ -298,6 +298,7 @@ struct cs4281_state {struct cs4281_pipeline pl[CS4281_NUMBER_OF_PIPELINES ]; }; +#include <linux/pm_legacy.h> #include "cs4281pm-24.c" #if CSDEBUG
sound/oss/cs4281/cs4281pm-24.c +0 -0
sound/oss/cs46xx.c +0 -0
sound/oss/maestro.c +1 -0
@@ -231,6 +231,7 @@#include <asm/uaccess.h> #include <linux/pm.h> +#include <linux/pm_legacy.h> static int maestro_pm_callback (struct pm_dev *dev,pm_request_t rqst,void *d);#include "maestro.h"
sound/oss/nm256_audio.c +1 -0
@@ -25,6 +25,7 @@#include <linux/kernel.h> #include <linux/module.h> #include <linux/pm.h> +#include <linux/pm_legacy.h> #include <linux/delay.h> #include <linux/spinlock.h> #include "sound_config.h"
sound/oss/opl3sa2.c +10 -8
@@ -70,6 +70,7 @@#include <linux/module.h> #include <linux/delay.h> #include <linux/pm.h> +#include <linux/pm_legacy.h> #include "sound_config.h" #include "ad1848.h"
@@ -138,7 +139,7 @@ typedef struct {struct pnp_dev * pdev;int activated;/* Whether said devices have been activated */ #endif -#ifdef CONFIG_PM +#ifdef CONFIG_PM_LEGACY unsigned int in_suspend;struct pm_dev *pmdev;#endif
@@ -341,7 +342,7 @@ static void opl3sa2_mixer_reset(opl3sa2_ }/* Currently only used for power management */ -#ifdef CONFIG_PM +#ifdef CONFIG_PM_LEGACY static void opl3sa2_mixer_restore (opl3sa2_state_t * devc) {if (devc) {
@@ -354,7 +355,7 @@ static void opl3sa2_mixer_restore(opl3sa } } } -#endif +#endif /* CONFIG_PM_LEGACY */ static inline void arg_to_vol_mono (unsigned int vol,int * value) {
@@ -831,7 +832,8 @@ static struct pnp_driver opl3sa2_driver/* End of component functions */ -#ifdef CONFIG_PM +#ifdef CONFIG_PM_LEGACY +static DEFINE_SPINLOCK (opl3sa2_lock);/* Power Management support functions */
@@ -906,7 +908,7 @@ static int opl3sa2_pm_callback(struct pm }return 0 ; } -#endif /* CONFIG_PM */ +#endif /* CONFIG_PM_LEGACY */ /* * Install OPL3-SA2 based card(s).
@@ -1019,12 +1021,12 @@ static int __init init_opl3sa2(void)/* ewww =) */ opl3sa2_state[card].card = card; -#ifdef CONFIG_PM +#ifdef CONFIG_PM_LEGACY /* register our power management capabilities */ opl3sa2_state[card].pmdev =pm_register (PM_ISA_DEV , card, opl3sa2_pm_callback);if (opl3sa2_state[card].pmdev) opl3sa2_state[card].pmdev->data = &opl3sa2_state[card]; -#endif /* CONFIG_PM */ +#endif /* CONFIG_PM_LEGACY */ /* * Set the Yamaha 3D enhancement mode (aka Ymersion) if asked to and
@@ -1081,7 +1083,7 @@ static void __exit cleanup_opl3sa2(void)int card;for (card =0 ; card < opl3sa2_cards_num; card++) { -#ifdef CONFIG_PM +#ifdef CONFIG_PM_LEGACY if (opl3sa2_state[card].pmdev)pm_unregister (opl3sa2_state[card].pmdev);#endif
Quoted 2 lines · Jeff Garzik
Since few people need the support anymore, this moves the legacy
pm_xxxfunctions toCONFIG_PM_LEGACY, andinclude/linux/pm_legacy.h.
Whoops. You'll need include/linux/pm_legacy.h too (attached).
Jeff
#ifndef __LINUX_PM_LEGACY_H__
#define __LINUX_PM_LEGACY_H__
#include <linux/config.h>
#ifdef CONFIG_PM_LEGACY
extern int pm_active;
#define PM_IS_ACTIVE() (pm_active != 0)
/*
* Register a device with power management
*/
struct pm_dev __deprecated *pm_register(pm_dev_t type, unsigned long id, pm_callback callback);
/*
* Unregister a device with power management */
void __deprecated pm_unregister(struct pm_dev *dev);
/*
* Unregister all devices with matching callback */
void __deprecated pm_unregister_all(pm_callback callback);
/*
* Send a request to all devices
*/
int __deprecated pm_send_all(pm_request_t rqst, void *data);
#else /* CONFIG_PM_LEGACY */
#define PM_IS_ACTIVE() 0
static inline struct pm_dev *pm_register(pm_dev_t type,
unsigned long id, pm_callback callback)
{
return NULL;
}static inline void pm_unregister(struct pm_dev *dev) {}
static inline void pm_unregister_all(pm_callback callback) {}
static inline int pm_send_all(pm_request_t rqst, void *data)
{
return 0;
}#endif /* CONFIG_PM_LEGACY */
#endif /* __LINUX_PM_LEGACY_H__ */
Hi!
Quoted 2 lines
Since few people need the support anymore, this moves the legacy
pm_xxxfunctions toCONFIG_PM_LEGACY, andinclude/linux/pm_legacy.h.
Yes, very nice!
Signature · 1 line
64 bytes from 195.113.31.123: icmp_seq=28 ttl=51 time=448769.1 ms