8 files changed, 9 insertions, 39 deletions

diff --git a/drivers/ide/h8300/ide-h8300.c b/drivers/ide/h8300/ide-h8300.c
index bde7a585f198..e2cdd2e9cdec 100644
--- a/drivers/ide/h8300/ide-h8300.c
+++ b/drivers/ide/h8300/ide-h8300.c
@@ -80,7 +80,7 @@ static void h8300_tf_load(ide_drive_t *drive, ide_task_t *task)
                 outb(tf->lbah, io_ports->lbah_addr);
 
         if (task->tf_flags & IDE_TFLAG_OUT_DEVICE)
-                outb((tf->device & HIHI) | drive->select.all,
+                outb((tf->device & HIHI) | drive->select,
                      io_ports->device_addr);
 }
 
diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c
index f8d8642903da..ecfb87c10097 100644
--- a/drivers/ide/ide-io.c
+++ b/drivers/ide/ide-io.c
@@ -495,7 +495,7 @@ static void ide_tf_set_specify_cmd(ide_drive_t *drive, struct ide_taskfile *tf)
         tf->lbal    = drive->sect;
         tf->lbam    = drive->cyl;
         tf->lbah    = drive->cyl >> 8;
-        tf->device  = (drive->head - 1) | drive->select.all;
+        tf->device  = (drive->head - 1) | drive->select;
         tf->command = ATA_CMD_INIT_DEV_PARAMS;
 }
 
diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c
index cec744cbbde0..925fd037cdde 100644
--- a/drivers/ide/ide-iops.c
+++ b/drivers/ide/ide-iops.c
@@ -181,7 +181,7 @@ void ide_tf_load(ide_drive_t *drive, ide_task_t *task)
                 tf_outb(tf->lbah, io_ports->lbah_addr);
 
         if (task->tf_flags & IDE_TFLAG_OUT_DEVICE)
-                tf_outb((tf->device & HIHI) | drive->select.all,
+                tf_outb((tf->device & HIHI) | drive->select,
                          io_ports->device_addr);
 }
 EXPORT_SYMBOL_GPL(ide_tf_load);
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index 58a2caf17903..242cfd09e16b 100644
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -446,7 +446,7 @@ static int do_probe (ide_drive_t *drive, u8 cmd)
         SELECT_DRIVE(drive);
         msleep(50);
 
-        if (ide_read_device(drive) != drive->select.all && present == 0) {
+        if (ide_read_device(drive) != drive->select && present == 0) {
                 if (drive->dn & 1) {
                         /* exit with drive0 selected */
                         SELECT_DRIVE(&hwif->drives[0]);
@@ -1211,7 +1211,7 @@ EXPORT_SYMBOL_GPL(ide_unregister_region);
 void ide_init_disk(struct gendisk *disk, ide_drive_t *drive)
 {
         ide_hwif_t *hwif = drive->hwif;
-        unsigned int unit = (drive->select.all >> 4) & 1;
+        unsigned int unit = drive->dn & 1;
 
         disk->major = hwif->major;
         disk->first_minor = unit << PARTN_BITS;
diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index 7624b937398a..9d3482d907c9 100644
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -114,7 +114,7 @@ static void ide_port_init_devices_data(ide_hwif_t *hwif)
                 memset(drive, 0, sizeof(*drive));
 
                 drive->media                    = ide_disk;
-                drive->select.all               = (unit<<4)|0xa0;
+                drive->select                   = (unit << 4) | ATA_DEVICE_OBS;
                 drive->hwif                     = hwif;
                 drive->ready_stat               = ATA_DRDY;
                 drive->bad_wstat                = BAD_W_STAT;
diff --git a/drivers/ide/legacy/ide-4drives.c b/drivers/ide/legacy/ide-4drives.c
index c76d55de6996..9e85b1ec9607 100644
--- a/drivers/ide/legacy/ide-4drives.c
+++ b/drivers/ide/legacy/ide-4drives.c
@@ -14,7 +14,7 @@ MODULE_PARM_DESC(probe, "probe for generic IDE chipset with 4 drives/port");
 static void ide_4drives_init_dev(ide_drive_t *drive)
 {
         if (drive->hwif->channel)
-                drive->select.all ^= 0x20;
+                drive->select ^= 0x20;
 }
 
 static const struct ide_port_ops ide_4drives_port_ops = {
diff --git a/drivers/ide/pci/scc_pata.c b/drivers/ide/pci/scc_pata.c
index 0eced0ae2e86..c2e85fc21b5a 100644
--- a/drivers/ide/pci/scc_pata.c
+++ b/drivers/ide/pci/scc_pata.c
@@ -705,7 +705,7 @@ static void scc_tf_load(ide_drive_t *drive, ide_task_t *task)
                 scc_ide_outb(tf->lbah, io_ports->lbah_addr);
 
         if (task->tf_flags & IDE_TFLAG_OUT_DEVICE)
-                scc_ide_outb((tf->device & HIHI) | drive->select.all,
+                scc_ide_outb((tf->device & HIHI) | drive->select,
                              io_ports->device_addr);
 }
 
diff --git a/include/linux/ide.h b/include/linux/ide.h
index 02984f1f041a..3e418b996ef5 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -279,36 +279,6 @@ typedef union {
 } special_t;
 
 /*
- * ATA-IDE Select Register, aka Device-Head
- *
- * head         : always zeros here
- * unit         : drive select number: 0/1
- * bit5         : always 1
- * lba          : using LBA instead of CHS
- * bit7         : always 1
- */
-typedef union {
-        unsigned all                    : 8;
-        struct {
-#if defined(__LITTLE_ENDIAN_BITFIELD)
-                unsigned head           : 4;
-                unsigned unit           : 1;
-                unsigned bit5           : 1;
-                unsigned lba            : 1;
-                unsigned bit7           : 1;
-#elif defined(__BIG_ENDIAN_BITFIELD)
-                unsigned bit7           : 1;
-                unsigned lba            : 1;
-                unsigned bit5           : 1;
-                unsigned unit           : 1;
-                unsigned head           : 4;
-#else
-#error "Please fix <asm/byteorder.h>"
-#endif
-        } b;
-} select_t, ata_select_t;
-
-/*
  * Status returned from various ide_ functions
  */
 typedef enum {
@@ -529,8 +499,8 @@ struct ide_drive_s {
         unsigned long timeout;          /* max time to wait for irq */
 
         special_t       special;        /* special action flags */
-        select_t        select;         /* basic drive/head select reg value */
 
+        u8      select;                 /* basic drive/head select reg value */
         u8      retry_pio;              /* retrying dma capable host in pio */
         u8      waiting_for_dma;        /* dma currently in progress */