ide: remove task_ioreg_t typedef (take 2)

Remove task_ioreg_t typedef from the kernel code (but leave it
in <linux/hdreg.h> for #ifndef/#endif __KERNEL__ case).

While at it also move sata_ioreg_t typedef under #ifndef/#endif __KERNEL__.

v2:
Remove name of the second parameter from ide_execute_command() declaration.
(Noticed by Sergei).

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

3 files changed, 15 insertions, 14 deletions

diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c
index b1781908e1f2..322c4691836a 100644
--- 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",
diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c
index bb9693dabe41..f4e8a0cf06e2 100644
--- a/drivers/ide/ide-iops.c
+++ b/drivers/ide/ide-iops.c
@@ -902,8 +902,9 @@ EXPORT_SYMBOL(ide_set_handler);
  *      handler and IRQ setup do not race. All IDE command kick off
  *      should go via this function or do equivalent locking.
  */
- 
-void ide_execute_command(ide_drive_t *drive, task_ioreg_t cmd, ide_handler_t *handler, unsigned timeout, ide_expiry_t *expiry)
+
+void ide_execute_command(ide_drive_t *drive, u8 cmd, ide_handler_t *handler,
+                         unsigned timeout, ide_expiry_t *expiry)
 {
         unsigned long flags;
         ide_hwgroup_t *hwgroup = HWGROUP(drive);
diff --git a/drivers/ide/ide-taskfile.c b/drivers/ide/ide-taskfile.c
index 2b60f1b0437e..91948a46cc6e 100644
--- a/drivers/ide/ide-taskfile.c
+++ b/drivers/ide/ide-taskfile.c
@@ -519,8 +519,8 @@ int ide_taskfile_ioctl (ide_drive_t *drive, unsigned int cmd, unsigned long arg)
         ide_task_t              args;
         u8 *outbuf              = NULL;
         u8 *inbuf               = NULL;
-        task_ioreg_t *argsptr   = args.tfRegister;
-        task_ioreg_t *hobsptr   = args.hobRegister;
+        u8 *argsptr             = args.tfRegister;
+        u8 *hobsptr             = args.hobRegister;
         int err                 = 0;
         int tasksize            = sizeof(struct ide_task_request_s);
         unsigned int taskin     = 0;