ide: add ide_pad_transfer() helper

* Add ide_pad_transfer() helper (which uses ->{in,out}put_data methods
  internally so the transfer is also padded to drive+host requirements)
  and use it instead of ide_atapi_{write_zeros,discard_data}().

* Remove no longer needed ide_atapi_{write_zeros,discard_data}().

Cc: Borislav Petkov <petkovbb@gmail.com>
Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/scsi/ide-scsi.c b/drivers/scsi/ide-scsi.c
index 7964cc146152..44d8d5163a1a 100644
--- a/drivers/scsi/ide-scsi.c
+++ b/drivers/scsi/ide-scsi.c
@@ -164,7 +164,7 @@ static void idescsi_input_buffers(ide_drive_t *drive, struct ide_atapi_pc *pc,
 
         if (bcount) {
                 printk (KERN_ERR "ide-scsi: scatter gather table too small, discarding data\n");
-                ide_atapi_discard_data(drive, bcount);
+                ide_pad_transfer(drive, 0, bcount);
         }
 }
 
@@ -201,7 +201,7 @@ static void idescsi_output_buffers(ide_drive_t *drive, struct ide_atapi_pc *pc,
 
         if (bcount) {
                 printk (KERN_ERR "ide-scsi: scatter gather table too small, padding with zeros\n");
-                ide_atapi_write_zeros(drive, bcount);
+                ide_pad_transfer(drive, 1, bcount);
         }
 }
 
@@ -438,7 +438,7 @@ static ide_startstop_t idescsi_pc_intr (ide_drive_t *drive)
                                 }
                                 pc->xferred += temp;
                                 pc->cur_pos += temp;
-                                ide_atapi_discard_data(drive, bcount - temp);
+                                ide_pad_transfer(drive, 0, bcount - temp);
                                 ide_set_handler(drive, &idescsi_pc_intr, get_timeout(pc), idescsi_expiry);
                                 return ide_started;
                         }