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>

diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c
index b1781908e1f2caffd4598a35c3037e1a60e59a85..322c4691836a4e85e1e209a8e3afbab1271dea82 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",

diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c
index bb9693dabe4180b4a1d93031a2115e85f7e22ab2..f4e8a0cf06e21a097d40f2f76d9681dfb9fb08e7 100644 (file)
--- 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 2b60f1b0437e9aa790d446369ac285243bd6719f..91948a46cc6e6d813bff94572ab8277d283b89f0 100644 (file)
--- 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;

diff --git a/include/linux/hdreg.h b/include/linux/hdreg.h
index 818c6afc109190affc2d592ea66fb120efdd139f..3bcb88560418c0cd220693ff4c9dbbbca91e30c7 100644 (file)
--- 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

diff --git a/include/linux/ide.h b/include/linux/ide.h
index 1fb03b6306761a7d2edea057d6f37ab061ba261f..66a38f1011753ac498d22d56e2d9f82bcabd2ab7 100644 (file)
--- 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;