Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 10582
b: refs/heads/master
c: 1a222bc
h: refs/heads/master
v: v3
  • Loading branch information
Takashi Iwai authored and Greg Kroah-Hartman committed Oct 28, 2005
1 parent 1e01a88 commit 6951753
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: c41455fbac06712992da491844449775cf9a8c80
refs/heads/master: 1a222bca26ca691e83be1b08f5e96ae96d0d8cae
8 changes: 4 additions & 4 deletions trunk/Documentation/driver-model/driver.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ struct device_driver {
int (*probe) (struct device * dev);
int (*remove) (struct device * dev);

int (*suspend) (struct device * dev, pm_message_t state, u32 level);
int (*resume) (struct device * dev, u32 level);
int (*suspend) (struct device * dev, pm_message_t state);
int (*resume) (struct device * dev);
};


Expand Down Expand Up @@ -194,11 +194,11 @@ 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, pm_message_t state, u32 level);
int (*suspend) (struct device * dev, pm_message_t state);

suspend is called to put the device in a low power state.

int (*resume) (struct device * dev, u32 level);
int (*resume) (struct device * dev);

Resume is used to bring a device back from a low power state.

Expand Down

0 comments on commit 6951753

Please sign in to comment.