diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-06-17 21:16:55 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-06-17 21:16:55 -0400 |
| commit | 4b337c5f245b6587ba844ac7bb13c313a2912f7b (patch) | |
| tree | 999c6a6580b76a083c8efb9dabff709d1c49fcd0 /drivers/ide/ide-pm.c | |
| parent | 492b057c426e4aa747484958e18e9da29003985d (diff) | |
| parent | 3fe0344faf7fdcb158bd5c1a9aec960a8d70c8e8 (diff) | |
Merge commit 'origin/master' into next
Diffstat (limited to 'drivers/ide/ide-pm.c')
| -rw-r--r-- | drivers/ide/ide-pm.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/ide/ide-pm.c b/drivers/ide/ide-pm.c index ba1488bd8430..c14ca144cffe 100644 --- a/drivers/ide/ide-pm.c +++ b/drivers/ide/ide-pm.c | |||
| @@ -3,7 +3,8 @@ | |||
| 3 | 3 | ||
| 4 | int generic_ide_suspend(struct device *dev, pm_message_t mesg) | 4 | int generic_ide_suspend(struct device *dev, pm_message_t mesg) |
| 5 | { | 5 | { |
| 6 | ide_drive_t *drive = dev->driver_data, *pair = ide_get_pair_dev(drive); | 6 | ide_drive_t *drive = dev_get_drvdata(dev); |
| 7 | ide_drive_t *pair = ide_get_pair_dev(drive); | ||
| 7 | ide_hwif_t *hwif = drive->hwif; | 8 | ide_hwif_t *hwif = drive->hwif; |
| 8 | struct request *rq; | 9 | struct request *rq; |
| 9 | struct request_pm_state rqpm; | 10 | struct request_pm_state rqpm; |
| @@ -34,7 +35,8 @@ int generic_ide_suspend(struct device *dev, pm_message_t mesg) | |||
| 34 | 35 | ||
| 35 | int generic_ide_resume(struct device *dev) | 36 | int generic_ide_resume(struct device *dev) |
| 36 | { | 37 | { |
| 37 | ide_drive_t *drive = dev->driver_data, *pair = ide_get_pair_dev(drive); | 38 | ide_drive_t *drive = dev_get_drvdata(dev); |
| 39 | ide_drive_t *pair = ide_get_pair_dev(drive); | ||
| 38 | ide_hwif_t *hwif = drive->hwif; | 40 | ide_hwif_t *hwif = drive->hwif; |
| 39 | struct request *rq; | 41 | struct request *rq; |
| 40 | struct request_pm_state rqpm; | 42 | struct request_pm_state rqpm; |