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, 1 insertions, 1 deletions

diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index e06a64605215..8f7d57660643 100644
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -124,7 +124,7 @@ static inline void do_identify (ide_drive_t *drive, u8 cmd)
 
         id = drive->id;
         /* read 512 bytes of id info */
-        hwif->ata_input_data(drive, NULL, id, SECTOR_WORDS);
+        hwif->input_data(drive, NULL, id, SECTOR_SIZE);
 
         drive->id_read = 1;
         local_irq_enable();