diff options
author | Pavel Machek <pavel@ucw.cz> | 2005-04-16 18:25:24 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-16 18:25:24 -0400 |
commit | 438510f6f079e94df294936b5bd8a7fd679cd1c9 (patch) | |
tree | 9c26a3eb527e95ed19e74d2c1d58e46f2d6908df /Documentation/driver-model/driver.txt | |
parent | 74ad74c1581c9a27582945ca01ffdb88fc774171 (diff) |
[PATCH] pm_message_t: more fixes in common and i386
I thought I'm done with fixing u32 vs. pm_message_t ... unfortunately
that turned out not to be the case as Russel King pointed out. Here are
fixes for Documentation and common code (mainly system devices).
Signed-off-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'Documentation/driver-model/driver.txt')
-rw-r--r-- | Documentation/driver-model/driver.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/driver-model/driver.txt b/Documentation/driver-model/driver.txt index 12447787d329..6031a68dd3f5 100644 --- a/Documentation/driver-model/driver.txt +++ b/Documentation/driver-model/driver.txt | |||
@@ -16,7 +16,7 @@ struct device_driver { | |||
16 | int (*probe) (struct device * dev); | 16 | int (*probe) (struct device * dev); |
17 | int (*remove) (struct device * dev); | 17 | int (*remove) (struct device * dev); |
18 | 18 | ||
19 | int (*suspend) (struct device * dev, u32 state, u32 level); | 19 | int (*suspend) (struct device * dev, pm_message_t state, u32 level); |
20 | int (*resume) (struct device * dev, u32 level); | 20 | int (*resume) (struct device * dev, u32 level); |
21 | 21 | ||
22 | void (*release) (struct device_driver * drv); | 22 | void (*release) (struct device_driver * drv); |
@@ -195,7 +195,7 @@ device; i.e. anything in the device's driver_data field. | |||
195 | If the device is still present, it should quiesce the device and place | 195 | If the device is still present, it should quiesce the device and place |
196 | it into a supported low-power state. | 196 | it into a supported low-power state. |
197 | 197 | ||
198 | int (*suspend) (struct device * dev, u32 state, u32 level); | 198 | int (*suspend) (struct device * dev, pm_message_t state, u32 level); |
199 | 199 | ||
200 | suspend is called to put the device in a low power state. There are | 200 | suspend is called to put the device in a low power state. There are |
201 | several stages to successfully suspending a device, which is denoted in | 201 | several stages to successfully suspending a device, which is denoted in |