ide: remove ata_nsector_t, ata_data_t and atapi_bcount_t

Remove ata_nsector_t, ata_data_t (unused) and atapi_bcount_t.

While at it:
* replace 'HWIF(drive)' by 'hwif'

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

1 files changed, 23 insertions, 17 deletions

diff --git a/drivers/scsi/ide-scsi.c b/drivers/scsi/ide-scsi.c
index c009f2351346..77e8a81228fc 100644
--- a/drivers/scsi/ide-scsi.c
+++ b/drivers/scsi/ide-scsi.c
@@ -395,11 +395,12 @@ static int idescsi_expiry(ide_drive_t *drive)
 static ide_startstop_t idescsi_pc_intr (ide_drive_t *drive)
 {
         idescsi_scsi_t *scsi = drive_to_idescsi(drive);
-        idescsi_pc_t *pc=scsi->pc;
+        ide_hwif_t *hwif = drive->hwif;
+        idescsi_pc_t *pc = scsi->pc;
         struct request *rq = pc->rq;
-        atapi_bcount_t bcount;
         atapi_ireason_t ireason;
         unsigned int temp;
+        u16 bcount;
         u8 stat;
 
 #if IDESCSI_DEBUG_LOG
@@ -436,8 +437,8 @@ static ide_startstop_t idescsi_pc_intr (ide_drive_t *drive)
                 idescsi_end_request (drive, 1, 0);
                 return ide_stopped;
         }
-        bcount.b.low    = HWIF(drive)->INB(IDE_BCOUNTL_REG);
-        bcount.b.high   = HWIF(drive)->INB(IDE_BCOUNTH_REG);
+        bcount = (hwif->INB(IDE_BCOUNTH_REG) << 8) |
+                  hwif->INB(IDE_BCOUNTL_REG);
         ireason.all     = HWIF(drive)->INB(IDE_IREASON_REG);
 
         if (ireason.b.cod) {
@@ -445,7 +446,7 @@ static ide_startstop_t idescsi_pc_intr (ide_drive_t *drive)
                 return ide_do_reset (drive);
         }
         if (ireason.b.io) {
-                temp = pc->actually_transferred + bcount.all;
+                temp = pc->actually_transferred + bcount;
                 if (temp > pc->request_transfer) {
                         if (temp > pc->buffer_size) {
                                 printk(KERN_ERR "ide-scsi: The scsi wants to "
@@ -458,11 +459,13 @@ static ide_startstop_t idescsi_pc_intr (ide_drive_t *drive)
                                                 idescsi_input_buffers(drive, pc, temp);
                                         else
                                                 drive->hwif->atapi_input_bytes(drive, pc->current_position, temp);
-                                        printk(KERN_ERR "ide-scsi: transferred %d of %d bytes\n", temp, bcount.all);
+                                        printk(KERN_ERR "ide-scsi: transferred"
+                                                        " %d of %d bytes\n",
+                                                        temp, bcount);
                                 }
                                 pc->actually_transferred += temp;
                                 pc->current_position += temp;
-                                idescsi_discard_data(drive, bcount.all - temp);
+                                idescsi_discard_data(drive, bcount - temp);
                                 ide_set_handler(drive, &idescsi_pc_intr, get_timeout(pc), idescsi_expiry);
                                 return ide_started;
                         }
@@ -474,19 +477,21 @@ static ide_startstop_t idescsi_pc_intr (ide_drive_t *drive)
         if (ireason.b.io) {
                 clear_bit(PC_WRITING, &pc->flags);
                 if (pc->sg)
-                        idescsi_input_buffers(drive, pc, bcount.all);
+                        idescsi_input_buffers(drive, pc, bcount);
                 else
-                        HWIF(drive)->atapi_input_bytes(drive, pc->current_position, bcount.all);
+                        hwif->atapi_input_bytes(drive, pc->current_position,
+                                                bcount);
         } else {
                 set_bit(PC_WRITING, &pc->flags);
                 if (pc->sg)
-                        idescsi_output_buffers (drive, pc, bcount.all);
+                        idescsi_output_buffers(drive, pc, bcount);
                 else
-                        HWIF(drive)->atapi_output_bytes(drive, pc->current_position, bcount.all);
+                        hwif->atapi_output_bytes(drive, pc->current_position,
+                                                 bcount);
         }
         /* Update the current position */
-        pc->actually_transferred += bcount.all;
-        pc->current_position += bcount.all;
+        pc->actually_transferred += bcount;
+        pc->current_position += bcount;
 
         /* And set the interrupt handler again */
         ide_set_handler(drive, &idescsi_pc_intr, get_timeout(pc), idescsi_expiry);
@@ -570,13 +575,14 @@ static ide_startstop_t idescsi_issue_pc (ide_drive_t *drive, idescsi_pc_t *pc)
 {
         idescsi_scsi_t *scsi = drive_to_idescsi(drive);
         ide_hwif_t *hwif = drive->hwif;
-        atapi_bcount_t bcount;
+        u16 bcount;
         u8 dma = 0;
 
         scsi->pc=pc;                                                    /* Set the current packet command */
         pc->actually_transferred=0;                                     /* We haven't transferred any data yet */
         pc->current_position=pc->buffer;
-        bcount.all = min(pc->request_transfer, 63 * 1024);              /* Request to transfer the entire buffer at once */
+        /* Request to transfer the entire buffer at once */
+        bcount = min(pc->request_transfer, 63 * 1024);
 
         if (drive->using_dma && !idescsi_map_sg(drive, pc)) {
                 hwif->sg_mapped = 1;
@@ -589,8 +595,8 @@ static ide_startstop_t idescsi_issue_pc (ide_drive_t *drive, idescsi_pc_t *pc)
                 HWIF(drive)->OUTB(drive->ctl, IDE_CONTROL_REG);
 
         hwif->OUTB(dma, IDE_FEATURE_REG);
-        HWIF(drive)->OUTB(bcount.b.high, IDE_BCOUNTH_REG);
-        HWIF(drive)->OUTB(bcount.b.low, IDE_BCOUNTL_REG);
+        hwif->OUTB((bcount >> 8) & 0xff, IDE_BCOUNTH_REG);
+        hwif->OUTB(bcount & 0xff, IDE_BCOUNTL_REG);
 
         if (dma)
                 set_bit(PC_DMA_OK, &pc->flags);