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>

1 files changed, 4 insertions, 3 deletions

diff --git a/include/linux/ide.h b/include/linux/ide.h
index 1fb03b630676..66a38f101175 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -1019,7 +1019,8 @@ int ide_end_dequeued_request(ide_drive_t *drive, struct request *rq,
 
 extern void ide_set_handler (ide_drive_t *drive, ide_handler_t *handler, unsigned int timeout, ide_expiry_t *expiry);
 
-extern void ide_execute_command(ide_drive_t *, task_ioreg_t cmd, ide_handler_t *, unsigned int, ide_expiry_t *);
+void ide_execute_command(ide_drive_t *, u8, ide_handler_t *, unsigned int,
+                         ide_expiry_t *);
 
 ide_startstop_t __ide_error(ide_drive_t *, struct request *, u8, u8);
 
@@ -1068,8 +1069,8 @@ typedef struct ide_task_s {
  *      struct hd_drive_hob_hdr         hobf;
  *      hob_struct_t            hobf;
  */
-        task_ioreg_t            tfRegister[8];
-        task_ioreg_t            hobRegister[8];
+        u8                      tfRegister[8];
+        u8                      hobRegister[8];
         ide_reg_valid_t         tf_out_flags;
         ide_reg_valid_t         tf_in_flags;
         int                     data_phase;