ide: move common code out of tf_load() method

[pandora-kernel.git] / drivers / ide / ide-probe.c

diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index d8c1c3e..6a98d7c 100644 (file)
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -287,7 +287,7 @@ int ide_dev_read_id(ide_drive_t *drive, u8 cmd, u16 *id)
 
                memset(&cmd, 0, sizeof(cmd));
                /* disable DMA & overlap */
-               cmd.tf_flags = IDE_TFLAG_OUT_FEATURE;
+               cmd.valid.out.tf = IDE_VALID_FEATURE;
 
                tp_ops->tf_load(drive, &cmd);
        }
@@ -340,7 +340,7 @@ static u8 ide_read_device(ide_drive_t *drive)
        struct ide_cmd cmd;
 
        memset(&cmd, 0, sizeof(cmd));
-       cmd.tf_flags = IDE_TFLAG_IN_DEVICE;
+       cmd.valid.in.tf = IDE_VALID_DEVICE;
 
        drive->hwif->tp_ops->tf_read(drive, &cmd);
 
@@ -1314,6 +1314,7 @@ struct ide_host *ide_host_alloc(const struct ide_port_info *d, hw_regs_t **hws)
                host->get_lock     = d->get_lock;
                host->release_lock = d->release_lock;
                host->host_flags = d->host_flags;
+               host->irq_flags = d->irq_flags;
        }
 
        return host;