diff options
Diffstat (limited to 'include/linux/device.h')
-rw-r--r-- | include/linux/device.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/linux/device.h b/include/linux/device.h index 5d5c197bad45..ed4e39f2c423 100644 --- a/include/linux/device.h +++ b/include/linux/device.h | |||
@@ -62,8 +62,6 @@ struct bus_type { | |||
62 | void (*shutdown)(struct device *dev); | 62 | void (*shutdown)(struct device *dev); |
63 | 63 | ||
64 | int (*suspend)(struct device *dev, pm_message_t state); | 64 | int (*suspend)(struct device *dev, pm_message_t state); |
65 | int (*suspend_late)(struct device *dev, pm_message_t state); | ||
66 | int (*resume_early)(struct device *dev); | ||
67 | int (*resume)(struct device *dev); | 65 | int (*resume)(struct device *dev); |
68 | 66 | ||
69 | struct dev_pm_ops *pm; | 67 | struct dev_pm_ops *pm; |
@@ -116,6 +114,8 @@ extern int bus_unregister_notifier(struct bus_type *bus, | |||
116 | #define BUS_NOTIFY_BOUND_DRIVER 0x00000003 /* driver bound to device */ | 114 | #define BUS_NOTIFY_BOUND_DRIVER 0x00000003 /* driver bound to device */ |
117 | #define BUS_NOTIFY_UNBIND_DRIVER 0x00000004 /* driver about to be | 115 | #define BUS_NOTIFY_UNBIND_DRIVER 0x00000004 /* driver about to be |
118 | unbound */ | 116 | unbound */ |
117 | #define BUS_NOTIFY_UNBOUND_DRIVER 0x00000005 /* driver is unbound | ||
118 | from the device */ | ||
119 | 119 | ||
120 | extern struct kset *bus_get_kset(struct bus_type *bus); | 120 | extern struct kset *bus_get_kset(struct bus_type *bus); |
121 | extern struct klist *bus_get_device_klist(struct bus_type *bus); | 121 | extern struct klist *bus_get_device_klist(struct bus_type *bus); |
@@ -194,6 +194,7 @@ struct class { | |||
194 | struct kobject *dev_kobj; | 194 | struct kobject *dev_kobj; |
195 | 195 | ||
196 | int (*dev_uevent)(struct device *dev, struct kobj_uevent_env *env); | 196 | int (*dev_uevent)(struct device *dev, struct kobj_uevent_env *env); |
197 | char *(*nodename)(struct device *dev); | ||
197 | 198 | ||
198 | void (*class_release)(struct class *class); | 199 | void (*class_release)(struct class *class); |
199 | void (*dev_release)(struct device *dev); | 200 | void (*dev_release)(struct device *dev); |
@@ -289,11 +290,9 @@ struct device_type { | |||
289 | const char *name; | 290 | const char *name; |
290 | struct attribute_group **groups; | 291 | struct attribute_group **groups; |
291 | int (*uevent)(struct device *dev, struct kobj_uevent_env *env); | 292 | int (*uevent)(struct device *dev, struct kobj_uevent_env *env); |
293 | char *(*nodename)(struct device *dev); | ||
292 | void (*release)(struct device *dev); | 294 | void (*release)(struct device *dev); |
293 | 295 | ||
294 | int (*suspend)(struct device *dev, pm_message_t state); | ||
295 | int (*resume)(struct device *dev); | ||
296 | |||
297 | struct dev_pm_ops *pm; | 296 | struct dev_pm_ops *pm; |
298 | }; | 297 | }; |
299 | 298 | ||
@@ -491,6 +490,7 @@ extern struct device *device_find_child(struct device *dev, void *data, | |||
491 | extern int device_rename(struct device *dev, char *new_name); | 490 | extern int device_rename(struct device *dev, char *new_name); |
492 | extern int device_move(struct device *dev, struct device *new_parent, | 491 | extern int device_move(struct device *dev, struct device *new_parent, |
493 | enum dpm_order dpm_order); | 492 | enum dpm_order dpm_order); |
493 | extern const char *device_get_nodename(struct device *dev, const char **tmp); | ||
494 | 494 | ||
495 | /* | 495 | /* |
496 | * Root device objects for grouping under /sys/devices | 496 | * Root device objects for grouping under /sys/devices |