1 files changed, 8 insertions, 11 deletions

diff --git a/drivers/ide/pmac.c b/drivers/ide/pmac.c
index f5b85f4c1b65..337d2d5b3028 100644
--- a/drivers/ide/pmac.c
+++ b/drivers/ide/pmac.c
@@ -404,7 +404,6 @@ kauai_lookup_timing(struct kauai_timing* table, int cycle_time)
 #define IDE_WAKEUP_DELAY        (1*HZ)
 
 static int pmac_ide_init_dma(ide_hwif_t *, const struct ide_port_info *);
-static int pmac_ide_build_dmatable(ide_drive_t *drive, struct request *rq);
 static void pmac_ide_selectproc(ide_drive_t *drive);
 static void pmac_ide_kauai_selectproc(ide_drive_t *drive);
 
@@ -1422,8 +1421,7 @@ out:
  * pmac_ide_build_dmatable builds the DBDMA command list
  * for a transfer and sets the DBDMA channel to point to it.
  */
-static int
-pmac_ide_build_dmatable(ide_drive_t *drive, struct request *rq)
+static int pmac_ide_build_dmatable(ide_drive_t *drive, struct ide_cmd *cmd)
 {
         ide_hwif_t *hwif = drive->hwif;
         pmac_ide_hwif_t *pmif =
@@ -1431,8 +1429,8 @@ pmac_ide_build_dmatable(ide_drive_t *drive, struct request *rq)
         struct dbdma_cmd *table;
         volatile struct dbdma_regs __iomem *dma = pmif->dma_regs;
         struct scatterlist *sg;
-        int wr = (rq_data_dir(rq) == WRITE);
-        int i = hwif->cmd.sg_nents, count = 0;
+        int wr = !!(cmd->tf_flags & IDE_TFLAG_WRITE);
+        int i = cmd->sg_nents, count = 0;
 
         /* DMA table is already aligned */
         table = (struct dbdma_cmd *) pmif->dma_table_cpu;
@@ -1504,23 +1502,22 @@ use_pio_instead:
  * Prepare a DMA transfer. We build the DMA table, adjust the timings for
  * a read on KeyLargo ATA/66 and mark us as waiting for DMA completion
  */
-static int
-pmac_ide_dma_setup(ide_drive_t *drive)
+static int pmac_ide_dma_setup(ide_drive_t *drive, struct ide_cmd *cmd)
 {
         ide_hwif_t *hwif = drive->hwif;
         pmac_ide_hwif_t *pmif =
                 (pmac_ide_hwif_t *)dev_get_drvdata(hwif->gendev.parent);
-        struct request *rq = hwif->rq;
         u8 unit = drive->dn & 1, ata4 = (pmif->kind == controller_kl_ata4);
+        u8 write = !!(cmd->tf_flags & IDE_TFLAG_WRITE);
 
-        if (!pmac_ide_build_dmatable(drive, rq)) {
-                ide_map_sg(drive, rq);
+        if (pmac_ide_build_dmatable(drive, cmd) == 0) {
+                ide_map_sg(drive, cmd);
                 return 1;
         }
 
         /* Apple adds 60ns to wrDataSetup on reads */
         if (ata4 && (pmif->timings[unit] & TR_66_UDMA_EN)) {
-                writel(pmif->timings[unit] + (!rq_data_dir(rq) ? 0x00800000UL : 0),
+                writel(pmif->timings[unit] + (write ? 0 : 0x00800000UL),
                         PMAC_IDE_REG(IDE_TIMING_CONFIG));
                 (void)readl(PMAC_IDE_REG(IDE_TIMING_CONFIG));
         }