ide: remove task_ioreg_t typedef (take 2)

[powerpc.git] / drivers / ide / ide-disk.c

diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c
index b178190..322c469 100644 (file)
--- a/drivers/ide/ide-disk.c
+++ b/drivers/ide/ide-disk.c
@@ -138,7 +138,7 @@ static ide_startstop_t __ide_do_rw_disk(ide_drive_t *drive, struct request *rq,
        ide_hwif_t *hwif        = HWIF(drive);
        unsigned int dma        = drive->using_dma;
        u8 lba48                = (drive->addressing == 1) ? 1 : 0;
-       task_ioreg_t command    = WIN_NOP;
+       u8 command              = WIN_NOP;
        ata_nsector_t           nsectors;
 
        nsectors.all            = (u16) rq->nr_sectors;
@@ -162,7 +162,7 @@ static ide_startstop_t __ide_do_rw_disk(ide_drive_t *drive, struct request *rq,
 
        if (drive->select.b.lba) {
                if (lba48) {
-                       task_ioreg_t tasklets[10];
+                       u8 tasklets[10];
 
                        pr_debug("%s: LBA=0x%012llx\n", drive->name,
                                        (unsigned long long)block);
@@ -171,16 +171,16 @@ static ide_startstop_t __ide_do_rw_disk(ide_drive_t *drive, struct request *rq,
                        tasklets[1] = 0;
                        tasklets[2] = nsectors.b.low;
                        tasklets[3] = nsectors.b.high;
-                       tasklets[4] = (task_ioreg_t) block;
-                       tasklets[5] = (task_ioreg_t) (block>>8);
-                       tasklets[6] = (task_ioreg_t) (block>>16);
-                       tasklets[7] = (task_ioreg_t) (block>>24);
+                       tasklets[4] = (u8) block;
+                       tasklets[5] = (u8)(block >>  8);
+                       tasklets[6] = (u8)(block >> 16);
+                       tasklets[7] = (u8)(block >> 24);
                        if (sizeof(block) == 4) {
-                               tasklets[8] = (task_ioreg_t) 0;
-                               tasklets[9] = (task_ioreg_t) 0;
+                               tasklets[8] = 0;
+                               tasklets[9] = 0;
                        } else {
-                               tasklets[8] = (task_ioreg_t)((u64)block >> 32);
-                               tasklets[9] = (task_ioreg_t)((u64)block >> 40);
+                               tasklets[8] = (u8)((u64)block >> 32);
+                               tasklets[9] = (u8)((u64)block >> 40);
                        }
 #ifdef DEBUG
                        printk("%s: 0x%02x%02x 0x%02x%02x%02x%02x%02x%02x\n",