ide: merge ->atapi_*put_bytes and ->ata_*put_data methods

* Merge ->atapi_{in,out}put_bytes and ->ata_{in,out}put_data methods
  into new ->{in,out}put_data methods which take number of bytes to
  transfer as an argument and always do padding.

While at it:

* Use 'hwif' or 'drive->hwif' instead of 'HWIF(drive)'.

There should be no functional changes caused by this patch (all users
of ->ata_{in,out}put_data methods were using multiply-of-4 word counts).

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

1 files changed, 7 insertions, 7 deletions

diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
index b34fd2bde96f..095e50a93869 100644
--- a/drivers/ide/ide-cd.c
+++ b/drivers/ide/ide-cd.c
@@ -613,7 +613,7 @@ static ide_startstop_t cdrom_transfer_packet_command(ide_drive_t *drive,
                 cmd_len = ATAPI_MIN_CDB_BYTES;
 
         /* send the command to the device */
-        HWIF(drive)->atapi_output_bytes(drive, rq->cmd, cmd_len);
+        hwif->output_data(drive, NULL, rq->cmd, cmd_len);
 
         /* start the DMA if need be */
         if (info->dma)
@@ -629,7 +629,7 @@ static void ide_cd_pad_transfer(ide_drive_t *drive, xfer_func_t *xf, int len)
 {
         while (len > 0) {
                 int dum = 0;
-                xf(drive, &dum, sizeof(dum));
+                xf(drive, NULL, &dum, sizeof(dum));
                 len -= sizeof(dum);
         }
 }
@@ -639,7 +639,7 @@ static void ide_cd_drain_data(ide_drive_t *drive, int nsects)
         while (nsects > 0) {
                 static char dum[SECTOR_SIZE];
 
-                drive->hwif->atapi_input_bytes(drive, dum, sizeof(dum));
+                drive->hwif->input_data(drive, NULL, dum, sizeof(dum));
                 nsects--;
         }
 }
@@ -666,7 +666,7 @@ static int ide_cd_check_ireason(ide_drive_t *drive, struct request *rq,
                 printk(KERN_ERR "%s: %s: wrong transfer direction!\n",
                                 drive->name, __func__);
 
-                xf = rw ? hwif->atapi_output_bytes : hwif->atapi_input_bytes;
+                xf = rw ? hwif->output_data : hwif->input_data;
                 ide_cd_pad_transfer(drive, xf, len);
         } else  if (rw == 0 && ireason == 1) {
                 /*
@@ -1019,10 +1019,10 @@ static ide_startstop_t cdrom_newpc_intr(ide_drive_t *drive)
 
         if (ireason == 0) {
                 write = 1;
-                xferfunc = HWIF(drive)->atapi_output_bytes;
+                xferfunc = hwif->output_data;
         } else {
                 write = 0;
-                xferfunc = HWIF(drive)->atapi_input_bytes;
+                xferfunc = hwif->input_data;
         }
 
         /* transfer data */
@@ -1061,7 +1061,7 @@ static ide_startstop_t cdrom_newpc_intr(ide_drive_t *drive)
                 if (blen > thislen)
                         blen = thislen;
 
-                xferfunc(drive, ptr, blen);
+                xferfunc(drive, NULL, ptr, blen);
 
                 thislen -= blen;
                 len -= blen;