diff options
| author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-03-27 12:46:39 +0100 |
|---|---|---|
| committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-03-27 12:46:39 +0100 |
| commit | 0dfb991c6943c810175376b58d1c29cfe532541b (patch) | |
| tree | c7b82d2ea9159e94c40f8df1a178dab4d2590ed3 /drivers/ide/ide-pm.c | |
| parent | 04d09b0e62f2180a7e3fa8578ed778eca0c454fd (diff) | |
| download | kernel_goldelico_gta04-0dfb991c6943c810175376b58d1c29cfe532541b.zip kernel_goldelico_gta04-0dfb991c6943c810175376b58d1c29cfe532541b.tar.gz kernel_goldelico_gta04-0dfb991c6943c810175376b58d1c29cfe532541b.tar.bz2 | |
ide: use ata_tf_protocols enums
* Add IDE_TFLAG_MULTI_PIO taskfile flag and set it for commands
using multi-PIO protocol.
* Use ata_tf_protocols enums instead of TASKFILE_* defines to
denote command's protocol and then rename ->data_phase field
to ->protocol.
* Remove no longer needed <linux/hdreg.h> includes.
There should be no functional changes caused by this patch.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/ide-pm.c')
| -rw-r--r-- | drivers/ide/ide-pm.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/ide/ide-pm.c b/drivers/ide/ide-pm.c index 5c9fc20..ebf2d21 100644 --- a/drivers/ide/ide-pm.c +++ b/drivers/ide/ide-pm.c @@ -1,6 +1,5 @@ #include <linux/kernel.h> #include <linux/ide.h> -#include <linux/hdreg.h> int generic_ide_suspend(struct device *dev, pm_message_t mesg) { @@ -164,8 +163,8 @@ ide_startstop_t ide_start_power_step(ide_drive_t *drive, struct request *rq) return ide_stopped; out_do_tf: - cmd->tf_flags = IDE_TFLAG_TF | IDE_TFLAG_DEVICE; - cmd->data_phase = TASKFILE_NO_DATA; + cmd->tf_flags = IDE_TFLAG_TF | IDE_TFLAG_DEVICE; + cmd->protocol = ATA_PROT_NODATA; return do_rw_taskfile(drive, cmd); } |