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

diff --git a/include/linux/hdreg.h b/include/linux/hdreg.h
index 818c6afc1091..3bcb88560418 100644
--- a/include/linux/hdreg.h
+++ b/include/linux/hdreg.h
@@ -87,10 +87,10 @@
 #ifndef __KERNEL__
 #define IDE_TASKFILE_STD_OUT_FLAGS      0xFE
 #define IDE_HOB_STD_OUT_FLAGS           0x3C
-#endif
 
 typedef unsigned char task_ioreg_t;
 typedef unsigned long sata_ioreg_t;
+#endif
 
 typedef union ide_reg_valid_s {
         unsigned all                            : 16;
@@ -116,8 +116,8 @@ typedef union ide_reg_valid_s {
 } ide_reg_valid_t;
 
 typedef struct ide_task_request_s {
-        task_ioreg_t    io_ports[8];
-        task_ioreg_t    hob_ports[8];
+        __u8            io_ports[8];
+        __u8            hob_ports[8];
         ide_reg_valid_t out_flags;
         ide_reg_valid_t in_flags;
         int             data_phase;
@@ -133,32 +133,32 @@ typedef struct ide_ioctl_request_s {
 } ide_ioctl_request_t;
 
 struct hd_drive_cmd_hdr {
-        task_ioreg_t command;
-        task_ioreg_t sector_number;
-        task_ioreg_t feature;
-        task_ioreg_t sector_count;
+        __u8 command;
+        __u8 sector_number;
+        __u8 feature;
+        __u8 sector_count;
 };
 
 typedef struct hd_drive_task_hdr {
-        task_ioreg_t data;
-        task_ioreg_t feature;
-        task_ioreg_t sector_count;
-        task_ioreg_t sector_number;
-        task_ioreg_t low_cylinder;
-        task_ioreg_t high_cylinder;
-        task_ioreg_t device_head;
-        task_ioreg_t command;
+        __u8 data;
+        __u8 feature;
+        __u8 sector_count;
+        __u8 sector_number;
+        __u8 low_cylinder;
+        __u8 high_cylinder;
+        __u8 device_head;
+        __u8 command;
 } task_struct_t;
 
 typedef struct hd_drive_hob_hdr {
-        task_ioreg_t data;
-        task_ioreg_t feature;
-        task_ioreg_t sector_count;
-        task_ioreg_t sector_number;
-        task_ioreg_t low_cylinder;
-        task_ioreg_t high_cylinder;
-        task_ioreg_t device_head;
-        task_ioreg_t control;
+        __u8 data;
+        __u8 feature;
+        __u8 sector_count;
+        __u8 sector_number;
+        __u8 low_cylinder;
+        __u8 high_cylinder;
+        __u8 device_head;
+        __u8 control;
 } hob_struct_t;
 
 #define TASKFILE_INVALID                0x7fff