Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: (35 commits)
  siimage: coding style cleanup (take 2)
  ide-cd: clean up cdrom_analyze_sense_data()
  ide-cd: fix test unsigned var < 0
  ide: add TSSTcorp CDDVDW SH-S202H to ivb_list[]
  piix: add Asus Eee 701 controller to short cable list
  ARM: always select HAVE_IDE
  remove the broken ETRAX_IDE driver
  ide: remove ->dma_prdtable field from ide_hwif_t
  ide: remove ->dma_vendor{1,3} fields from ide_hwif_t
  scc_pata: add ->dma_host_set and ->dma_start methods
  ide: skip "VLB sync" if host uses MMIO
  ide: add ide_pad_transfer() helper
  ide: remove ->INW and ->OUTW methods
  ide: use IDE I/O helpers directly in ide_tf_{load,read}()
  ns87415: add ->tf_read method
  scc_pata: add ->tf_{load,read} methods
  ide-h8300: add ->tf_{load,read} methods
  ide-cris: add ->tf_{load,read} methods
  ide: add ->tf_load and ->tf_read methods
  ide: move ide_tf_{load,read} to ide-iops.c
  ...

1 files changed, 10 insertions, 9 deletions

diff --git a/drivers/ide/ide-tape.c b/drivers/ide/ide-tape.c
index 29870c415110..54a43b044608 100644
--- a/drivers/ide/ide-tape.c
+++ b/drivers/ide/ide-tape.c
@@ -395,13 +395,13 @@ static void idetape_input_buffers(ide_drive_t *drive, struct ide_atapi_pc *pc,
                 if (bh == NULL) {
                         printk(KERN_ERR "ide-tape: bh == NULL in "
                                 "idetape_input_buffers\n");
-                        ide_atapi_discard_data(drive, bcount);
+                        ide_pad_transfer(drive, 0, bcount);
                         return;
                 }
                 count = min(
                         (unsigned int)(bh->b_size - atomic_read(&bh->b_count)),
                         bcount);
-                HWIF(drive)->atapi_input_bytes(drive, bh->b_data +
+                drive->hwif->input_data(drive, NULL, bh->b_data +
                                         atomic_read(&bh->b_count), count);
                 bcount -= count;
                 atomic_add(count, &bh->b_count);
@@ -427,7 +427,7 @@ static void idetape_output_buffers(ide_drive_t *drive, struct ide_atapi_pc *pc,
                         return;
                 }
                 count = min((unsigned int)pc->b_count, (unsigned int)bcount);
-                HWIF(drive)->atapi_output_bytes(drive, pc->b_data, count);
+                drive->hwif->output_data(drive, NULL, pc->b_data, count);
                 bcount -= count;
                 pc->b_data += count;
                 pc->b_count -= count;
@@ -871,7 +871,7 @@ static ide_startstop_t idetape_pc_intr(ide_drive_t *drive)
                                 printk(KERN_ERR "ide-tape: The tape wants to "
                                         "send us more data than expected "
                                         "- discarding data\n");
-                                ide_atapi_discard_data(drive, bcount);
+                                ide_pad_transfer(drive, 0, bcount);
                                 ide_set_handler(drive, &idetape_pc_intr,
                                                 IDETAPE_WAIT_CMD, NULL);
                                 return ide_started;
@@ -880,16 +880,16 @@ static ide_startstop_t idetape_pc_intr(ide_drive_t *drive)
                                 "data than expected - allowing transfer\n");
                 }
                 iobuf = &idetape_input_buffers;
-                xferfunc = hwif->atapi_input_bytes;
+                xferfunc = hwif->input_data;
         } else {
                 iobuf = &idetape_output_buffers;
-                xferfunc = hwif->atapi_output_bytes;
+                xferfunc = hwif->output_data;
         }
 
         if (pc->bh)
                 iobuf(drive, pc, bcount);
         else
-                xferfunc(drive, pc->cur_pos, bcount);
+                xferfunc(drive, NULL, pc->cur_pos, bcount);
 
         /* Update the current position */
         pc->xferred += bcount;
@@ -979,7 +979,8 @@ static ide_startstop_t idetape_transfer_pc(ide_drive_t *drive)
                 hwif->dma_ops->dma_start(drive);
 #endif
         /* Send the actual packet */
-        HWIF(drive)->atapi_output_bytes(drive, pc->c, 12);
+        hwif->output_data(drive, NULL, pc->c, 12);
+
         return ide_started;
 }
 
@@ -1055,7 +1056,7 @@ static ide_startstop_t idetape_issue_pc(ide_drive_t *drive,
                                     IDETAPE_WAIT_CMD, NULL);
                 return ide_started;
         } else {
-                hwif->OUTB(WIN_PACKETCMD, hwif->io_ports.command_addr);
+                ide_execute_pkt_cmd(drive);
                 return idetape_transfer_pc(drive);
         }
 }