diff options
| author | Pavel Machek <pavel@ucw.cz> | 2005-04-16 15:25:24 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-16 15:25:24 -0700 |
| commit | 438510f6f079e94df294936b5bd8a7fd679cd1c9 (patch) | |
| tree | 9c26a3eb527e95ed19e74d2c1d58e46f2d6908df /Documentation/driver-model | |
| parent | 74ad74c1581c9a27582945ca01ffdb88fc774171 (diff) | |
| download | op-kernel-dev-438510f6f079e94df294936b5bd8a7fd679cd1c9.zip op-kernel-dev-438510f6f079e94df294936b5bd8a7fd679cd1c9.tar.gz | |
[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')
| -rw-r--r-- | Documentation/driver-model/bus.txt | 2 | ||||
| -rw-r--r-- | Documentation/driver-model/driver.txt | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/driver-model/bus.txt b/Documentation/driver-model/bus.txt index dd62c7b..5001b75 100644 --- a/Documentation/driver-model/bus.txt +++ b/Documentation/driver-model/bus.txt @@ -18,7 +18,7 @@ struct bus_type { int (*match)(struct device * dev, struct device_driver * drv); int (*hotplug) (struct device *dev, char **envp, int num_envp, char *buffer, int buffer_size); - int (*suspend)(struct device * dev, u32 state); + int (*suspend)(struct device * dev, pm_message_t state); int (*resume)(struct device * dev); }; diff --git a/Documentation/driver-model/driver.txt b/Documentation/driver-model/driver.txt index 1244778..6031a68 100644 --- a/Documentation/driver-model/driver.txt +++ b/Documentation/driver-model/driver.txt @@ -16,7 +16,7 @@ struct device_driver { int (*probe) (struct device * dev); int (*remove) (struct device * dev); - int (*suspend) (struct device * dev, u32 state, u32 level); + int (*suspend) (struct device * dev, pm_message_t state, u32 level); int (*resume) (struct device * dev, u32 level); void (*release) (struct device_driver * drv); @@ -195,7 +195,7 @@ device; i.e. anything in the device's driver_data field. If the device is still present, it should quiesce the device and place it into a supported low-power state. - int (*suspend) (struct device * dev, u32 state, u32 level); + int (*suspend) (struct device * dev, pm_message_t state, u32 level); suspend is called to put the device in a low power state. There are several stages to successfully suspending a device, which is denoted in |
