diff options
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 dd62c7b80b3f..5001b7511626 100644 --- a/Documentation/driver-model/bus.txt +++ b/Documentation/driver-model/bus.txt | |||
@@ -18,7 +18,7 @@ struct bus_type { | |||
18 | int (*match)(struct device * dev, struct device_driver * drv); | 18 | int (*match)(struct device * dev, struct device_driver * drv); |
19 | int (*hotplug) (struct device *dev, char **envp, | 19 | int (*hotplug) (struct device *dev, char **envp, |
20 | int num_envp, char *buffer, int buffer_size); | 20 | int num_envp, char *buffer, int buffer_size); |
21 | int (*suspend)(struct device * dev, u32 state); | 21 | int (*suspend)(struct device * dev, pm_message_t state); |
22 | int (*resume)(struct device * dev); | 22 | int (*resume)(struct device * dev); |
23 | }; | 23 | }; |
24 | 24 | ||
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 |