diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/asm-generic/device.h | 3 | ||||
-rw-r--r-- | include/linux/device.h | 9 | ||||
-rw-r--r-- | include/linux/platform_device.h | 5 |
3 files changed, 11 insertions, 6 deletions
diff --git a/include/asm-generic/device.h b/include/asm-generic/device.h index c17c9600f220..d7c76bba640d 100644 --- a/include/asm-generic/device.h +++ b/include/asm-generic/device.h | |||
@@ -9,4 +9,7 @@ | |||
9 | struct dev_archdata { | 9 | struct dev_archdata { |
10 | }; | 10 | }; |
11 | 11 | ||
12 | struct pdev_archdata { | ||
13 | }; | ||
14 | |||
12 | #endif /* _ASM_GENERIC_DEVICE_H */ | 15 | #endif /* _ASM_GENERIC_DEVICE_H */ |
diff --git a/include/linux/device.h b/include/linux/device.h index aebb81036db2..a28642975053 100644 --- a/include/linux/device.h +++ b/include/linux/device.h | |||
@@ -62,7 +62,7 @@ struct bus_type { | |||
62 | int (*suspend)(struct device *dev, pm_message_t state); | 62 | int (*suspend)(struct device *dev, pm_message_t state); |
63 | int (*resume)(struct device *dev); | 63 | int (*resume)(struct device *dev); |
64 | 64 | ||
65 | struct dev_pm_ops *pm; | 65 | const struct dev_pm_ops *pm; |
66 | 66 | ||
67 | struct bus_type_private *p; | 67 | struct bus_type_private *p; |
68 | }; | 68 | }; |
@@ -132,7 +132,7 @@ struct device_driver { | |||
132 | int (*resume) (struct device *dev); | 132 | int (*resume) (struct device *dev); |
133 | struct attribute_group **groups; | 133 | struct attribute_group **groups; |
134 | 134 | ||
135 | struct dev_pm_ops *pm; | 135 | const struct dev_pm_ops *pm; |
136 | 136 | ||
137 | struct driver_private *p; | 137 | struct driver_private *p; |
138 | }; | 138 | }; |
@@ -200,7 +200,8 @@ struct class { | |||
200 | int (*suspend)(struct device *dev, pm_message_t state); | 200 | int (*suspend)(struct device *dev, pm_message_t state); |
201 | int (*resume)(struct device *dev); | 201 | int (*resume)(struct device *dev); |
202 | 202 | ||
203 | struct dev_pm_ops *pm; | 203 | const struct dev_pm_ops *pm; |
204 | |||
204 | struct class_private *p; | 205 | struct class_private *p; |
205 | }; | 206 | }; |
206 | 207 | ||
@@ -291,7 +292,7 @@ struct device_type { | |||
291 | char *(*nodename)(struct device *dev); | 292 | char *(*nodename)(struct device *dev); |
292 | void (*release)(struct device *dev); | 293 | void (*release)(struct device *dev); |
293 | 294 | ||
294 | struct dev_pm_ops *pm; | 295 | const struct dev_pm_ops *pm; |
295 | }; | 296 | }; |
296 | 297 | ||
297 | /* interface for exporting device attributes */ | 298 | /* interface for exporting device attributes */ |
diff --git a/include/linux/platform_device.h b/include/linux/platform_device.h index 8dc5123b6305..3c6675c2444b 100644 --- a/include/linux/platform_device.h +++ b/include/linux/platform_device.h | |||
@@ -22,6 +22,9 @@ struct platform_device { | |||
22 | struct resource * resource; | 22 | struct resource * resource; |
23 | 23 | ||
24 | struct platform_device_id *id_entry; | 24 | struct platform_device_id *id_entry; |
25 | |||
26 | /* arch specific additions */ | ||
27 | struct pdev_archdata archdata; | ||
25 | }; | 28 | }; |
26 | 29 | ||
27 | #define platform_get_device_id(pdev) ((pdev)->id_entry) | 30 | #define platform_get_device_id(pdev) ((pdev)->id_entry) |
@@ -57,8 +60,6 @@ struct platform_driver { | |||
57 | int (*remove)(struct platform_device *); | 60 | int (*remove)(struct platform_device *); |
58 | void (*shutdown)(struct platform_device *); | 61 | void (*shutdown)(struct platform_device *); |
59 | int (*suspend)(struct platform_device *, pm_message_t state); | 62 | int (*suspend)(struct platform_device *, pm_message_t state); |
60 | int (*suspend_late)(struct platform_device *, pm_message_t state); | ||
61 | int (*resume_early)(struct platform_device *); | ||
62 | int (*resume)(struct platform_device *); | 63 | int (*resume)(struct platform_device *); |
63 | struct device_driver driver; | 64 | struct device_driver driver; |
64 | struct platform_device_id *id_table; | 65 | struct platform_device_id *id_table; |