diff options
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/device.h | 7 | ||||
| -rw-r--r-- | include/linux/pm.h | 8 | ||||
| -rw-r--r-- | include/linux/sysdev.h | 11 |
3 files changed, 0 insertions, 26 deletions
diff --git a/include/linux/device.h b/include/linux/device.h index ab8dfc095709..ea9db9b0f248 100644 --- a/include/linux/device.h +++ b/include/linux/device.h | |||
| @@ -633,13 +633,6 @@ static inline int devtmpfs_mount(const char *mountpoint) { return 0; } | |||
| 633 | /* drivers/base/power/shutdown.c */ | 633 | /* drivers/base/power/shutdown.c */ |
| 634 | extern void device_shutdown(void); | 634 | extern void device_shutdown(void); |
| 635 | 635 | ||
| 636 | #ifndef CONFIG_ARCH_NO_SYSDEV_OPS | ||
| 637 | /* drivers/base/sys.c */ | ||
| 638 | extern void sysdev_shutdown(void); | ||
| 639 | #else | ||
| 640 | static inline void sysdev_shutdown(void) { } | ||
| 641 | #endif | ||
| 642 | |||
| 643 | /* debugging and troubleshooting/diagnostic helpers. */ | 636 | /* debugging and troubleshooting/diagnostic helpers. */ |
| 644 | extern const char *dev_driver_string(const struct device *dev); | 637 | extern const char *dev_driver_string(const struct device *dev); |
| 645 | 638 | ||
diff --git a/include/linux/pm.h b/include/linux/pm.h index 512e09177e57..3c053e2beb84 100644 --- a/include/linux/pm.h +++ b/include/linux/pm.h | |||
| @@ -529,14 +529,6 @@ struct dev_power_domain { | |||
| 529 | */ | 529 | */ |
| 530 | 530 | ||
| 531 | #ifdef CONFIG_PM_SLEEP | 531 | #ifdef CONFIG_PM_SLEEP |
| 532 | #ifndef CONFIG_ARCH_NO_SYSDEV_OPS | ||
| 533 | extern int sysdev_suspend(pm_message_t state); | ||
| 534 | extern int sysdev_resume(void); | ||
| 535 | #else | ||
| 536 | static inline int sysdev_suspend(pm_message_t state) { return 0; } | ||
| 537 | static inline int sysdev_resume(void) { return 0; } | ||
| 538 | #endif | ||
| 539 | |||
| 540 | extern void device_pm_lock(void); | 532 | extern void device_pm_lock(void); |
| 541 | extern void dpm_resume_noirq(pm_message_t state); | 533 | extern void dpm_resume_noirq(pm_message_t state); |
| 542 | extern void dpm_resume_end(pm_message_t state); | 534 | extern void dpm_resume_end(pm_message_t state); |
diff --git a/include/linux/sysdev.h b/include/linux/sysdev.h index dfb078db8ebb..d35e783a598c 100644 --- a/include/linux/sysdev.h +++ b/include/linux/sysdev.h | |||
| @@ -34,12 +34,6 @@ struct sysdev_class { | |||
| 34 | struct list_head drivers; | 34 | struct list_head drivers; |
| 35 | struct sysdev_class_attribute **attrs; | 35 | struct sysdev_class_attribute **attrs; |
| 36 | struct kset kset; | 36 | struct kset kset; |
| 37 | #ifndef CONFIG_ARCH_NO_SYSDEV_OPS | ||
| 38 | /* Default operations for these types of devices */ | ||
| 39 | int (*shutdown)(struct sys_device *); | ||
| 40 | int (*suspend)(struct sys_device *, pm_message_t state); | ||
| 41 | int (*resume)(struct sys_device *); | ||
| 42 | #endif | ||
| 43 | }; | 37 | }; |
| 44 | 38 | ||
| 45 | struct sysdev_class_attribute { | 39 | struct sysdev_class_attribute { |
| @@ -77,11 +71,6 @@ struct sysdev_driver { | |||
| 77 | struct list_head entry; | 71 | struct list_head entry; |
| 78 | int (*add)(struct sys_device *); | 72 | int (*add)(struct sys_device *); |
| 79 | int (*remove)(struct sys_device *); | 73 | int (*remove)(struct sys_device *); |
| 80 | #ifndef CONFIG_ARCH_NO_SYSDEV_OPS | ||
| 81 | int (*shutdown)(struct sys_device *); | ||
| 82 | int (*suspend)(struct sys_device *, pm_message_t state); | ||
| 83 | int (*resume)(struct sys_device *); | ||
| 84 | #endif | ||
| 85 | }; | 74 | }; |
| 86 | 75 | ||
| 87 | 76 | ||
