13 files changed, 41 insertions, 48 deletions

diff --git a/drivers/ide/pci/aec62xx.c b/drivers/ide/pci/aec62xx.c
index e7475ba559c7..c294b19f5552 100644
--- a/drivers/ide/pci/aec62xx.c
+++ b/drivers/ide/pci/aec62xx.c
@@ -115,7 +115,7 @@ static void aec6260_set_mode(ide_drive_t *drive, const u8 speed)
         struct pci_dev *dev     = to_pci_dev(hwif->dev);
         struct ide_host *host   = pci_get_drvdata(dev);
         struct chipset_bus_clock_list_entry *bus_clock = host->host_priv;
-        u8 unit         = (drive->select.b.unit & 0x01);
+        u8 unit                 = drive->dn & 1;
         u8 tmp1 = 0, tmp2 = 0;
         u8 ultra = 0, drive_conf = 0, ultra_conf = 0;
         unsigned long flags;
diff --git a/drivers/ide/pci/alim15x3.c b/drivers/ide/pci/alim15x3.c
index 053c75263918..f1c57f72bbdb 100644
--- a/drivers/ide/pci/alim15x3.c
+++ b/drivers/ide/pci/alim15x3.c
@@ -77,8 +77,7 @@ static void ali_set_pio_mode(ide_drive_t *drive, const u8 pio)
         int bus_speed = ide_pci_clk ? ide_pci_clk : 33;
         int port = hwif->channel ? 0x5c : 0x58;
         int portFIFO = hwif->channel ? 0x55 : 0x54;
-        u8 cd_dma_fifo = 0;
-        int unit = drive->select.b.unit & 1;
+        u8 cd_dma_fifo = 0, unit = drive->dn & 1;
 
         if ((s_clc = (s_time * bus_speed + 999) / 1000) >= 8)
                 s_clc = 0;
@@ -112,7 +111,7 @@ static void ali_set_pio_mode(ide_drive_t *drive, const u8 pio)
         }
         
         pci_write_config_byte(dev, port, s_clc);
-        pci_write_config_byte(dev, port+drive->select.b.unit+2, (a_clc << 4) | r_clc);
+        pci_write_config_byte(dev, port + unit + 2, (a_clc << 4) | r_clc);
         local_irq_restore(flags);
 }
 
@@ -154,7 +153,7 @@ static void ali_set_dma_mode(ide_drive_t *drive, const u8 speed)
         ide_hwif_t *hwif        = HWIF(drive);
         struct pci_dev *dev     = to_pci_dev(hwif->dev);
         u8 speed1               = speed;
-        u8 unit                 = (drive->select.b.unit & 0x01);
+        u8 unit                 = drive->dn & 1;
         u8 tmpbyte              = 0x00;
         int m5229_udma          = (hwif->channel) ? 0x57 : 0x56;
 
diff --git a/drivers/ide/pci/cmd640.c b/drivers/ide/pci/cmd640.c
index d3afdffcb07a..e4306647d00d 100644
--- a/drivers/ide/pci/cmd640.c
+++ b/drivers/ide/pci/cmd640.c
@@ -468,7 +468,7 @@ static void program_drive_counts(ide_drive_t *drive, unsigned int index)
          */
         if (index > 1) {
                 ide_hwif_t *hwif = drive->hwif;
-                ide_drive_t *peer = &hwif->drives[!drive->select.b.unit];
+                ide_drive_t *peer = &hwif->drives[!(drive->dn & 1)];
                 unsigned int mate = index ^ 1;
 
                 if (peer->dev_flags & IDE_DFLAG_PRESENT) {
@@ -607,7 +607,7 @@ static void cmd640_set_pio_mode(ide_drive_t *drive, const u8 pio)
 
 static void cmd640_init_dev(ide_drive_t *drive)
 {
-        unsigned int i = drive->hwif->channel * 2 + drive->select.b.unit;
+        unsigned int i = drive->hwif->channel * 2 + (drive->dn & 1);
 
 #ifdef CONFIG_BLK_DEV_CMD640_ENHANCED
         /*
diff --git a/drivers/ide/pci/cs5535.c b/drivers/ide/pci/cs5535.c
index 1e5bc59ea2fb..fa6dca9f3287 100644
--- a/drivers/ide/pci/cs5535.c
+++ b/drivers/ide/pci/cs5535.c
@@ -76,7 +76,7 @@ static unsigned int cs5535_udma_timings[5] =
 static void cs5535_set_speed(ide_drive_t *drive, const u8 speed)
 {
         u32 reg = 0, dummy;
-        int unit = drive->select.b.unit;
+        u8 unit = drive->dn & 1;
 
         /* Set the PIO timings */
         if (speed < XFER_SW_DMA_0) {
diff --git a/drivers/ide/pci/cy82c693.c b/drivers/ide/pci/cy82c693.c
index 5241ef74f8d9..e5f8fc0ed318 100644
--- a/drivers/ide/pci/cy82c693.c
+++ b/drivers/ide/pci/cy82c693.c
@@ -178,8 +178,7 @@ static void cy82c693_set_dma_mode(ide_drive_t *drive, const u8 mode)
 
 #if CY82C693_DEBUG_INFO
         printk(KERN_INFO "%s (ch=%d, dev=%d): set DMA mode to %d (single=%d)\n",
-                drive->name, HWIF(drive)->channel, drive->select.b.unit,
-                mode & 3, single);
+                drive->name, hwif->channel, drive->dn & 1, mode & 3, single);
 #endif /* CY82C693_DEBUG_INFO */
 
         /*
@@ -224,7 +223,7 @@ static void cy82c693_set_pio_mode(ide_drive_t *drive, const u8 pio)
         compute_clocks(pio, &pclk);
 
         /* now let's write  the clocks registers */
-        if (drive->select.b.unit == 0) {
+        if ((drive->dn & 1) == 0) {
                 /*
                  * set master drive
                  * address setup control register
@@ -266,7 +265,7 @@ static void cy82c693_set_pio_mode(ide_drive_t *drive, const u8 pio)
 #if CY82C693_DEBUG_INFO
         printk(KERN_INFO "%s (ch=%d, dev=%d): set PIO timing to "
                 "(addr=0x%X, ior=0x%X, iow=0x%X, 8bit=0x%X)\n",
-                drive->name, hwif->channel, drive->select.b.unit,
+                drive->name, hwif->channel, drive->dn & 1,
                 addrCtrl, pclk.time_16r, pclk.time_16w, pclk.time_8);
 #endif /* CY82C693_DEBUG_INFO */
 }
diff --git a/drivers/ide/pci/it821x.c b/drivers/ide/pci/it821x.c
index b761015ee190..1aada445a9c8 100644
--- a/drivers/ide/pci/it821x.c
+++ b/drivers/ide/pci/it821x.c
@@ -138,8 +138,7 @@ static void it821x_program_udma(ide_drive_t *drive, u16 timing)
         struct pci_dev *dev = to_pci_dev(hwif->dev);
         struct it821x_dev *itdev = ide_get_hwifdata(hwif);
         int channel = hwif->channel;
-        int unit = drive->select.b.unit;
-        u8 conf;
+        u8 unit = drive->dn & 1, conf;
 
         /* Program UDMA timing bits */
         if(itdev->clock_mode == ATA_66)
@@ -168,13 +167,11 @@ static void it821x_clock_strategy(ide_drive_t *drive)
         ide_hwif_t *hwif = drive->hwif;
         struct pci_dev *dev = to_pci_dev(hwif->dev);
         struct it821x_dev *itdev = ide_get_hwifdata(hwif);
+        ide_drive_t *pair;
+        int clock, altclock, sel = 0;
+        u8 unit = drive->dn & 1, v;
 
-        u8 unit = drive->select.b.unit;
-        ide_drive_t *pair = &hwif->drives[1-unit];
-
-        int clock, altclock;
-        u8 v;
-        int sel = 0;
+        pair = &hwif->drives[1 - unit];
 
         if(itdev->want[0][0] > itdev->want[1][0]) {
                 clock = itdev->want[0][1];
@@ -240,16 +237,17 @@ static void it821x_clock_strategy(ide_drive_t *drive)
 
 static void it821x_set_pio_mode(ide_drive_t *drive, const u8 pio)
 {
-        ide_hwif_t *hwif        = drive->hwif;
+        ide_hwif_t *hwif = drive->hwif;
         struct it821x_dev *itdev = ide_get_hwifdata(hwif);
-        int unit = drive->select.b.unit;
-        ide_drive_t *pair = &hwif->drives[1 - unit];
-        u8 set_pio = pio;
+        ide_drive_t *pair;
+        u8 unit = drive->dn & 1, set_pio = pio;
 
         /* Spec says 89 ref driver uses 88 */
         static u16 pio_timings[]= { 0xAA88, 0xA382, 0xA181, 0x3332, 0x3121 };
         static u8 pio_want[]    = { ATA_66, ATA_66, ATA_66, ATA_66, ATA_ANY };
 
+        pair = &hwif->drives[1 - unit];
+
         /*
          * Compute the best PIO mode we can for a given device. We must
          * pick a speed that does not cause problems with the other device
@@ -286,9 +284,7 @@ static void it821x_tune_mwdma (ide_drive_t *drive, byte mode_wanted)
         ide_hwif_t *hwif = drive->hwif;
         struct pci_dev *dev = to_pci_dev(hwif->dev);
         struct it821x_dev *itdev = (void *)ide_get_hwifdata(hwif);
-        int unit = drive->select.b.unit;
-        int channel = hwif->channel;
-        u8 conf;
+        u8 unit = drive->dn & 1, channel = hwif->channel, conf;
 
         static u16 dma[]        = { 0x8866, 0x3222, 0x3121 };
         static u8 mwdma_want[]  = { ATA_ANY, ATA_66, ATA_ANY };
@@ -325,9 +321,7 @@ static void it821x_tune_udma (ide_drive_t *drive, byte mode_wanted)
         ide_hwif_t *hwif = drive->hwif;
         struct pci_dev *dev = to_pci_dev(hwif->dev);
         struct it821x_dev *itdev = ide_get_hwifdata(hwif);
-        int unit = drive->select.b.unit;
-        int channel = hwif->channel;
-        u8 conf;
+        u8 unit = drive->dn & 1, channel = hwif->channel, conf;
 
         static u16 udma[]       = { 0x4433, 0x4231, 0x3121, 0x2121, 0x1111, 0x2211, 0x1111 };
         static u8 udma_want[]   = { ATA_ANY, ATA_50, ATA_ANY, ATA_66, ATA_66, ATA_50, ATA_66 };
@@ -369,7 +363,8 @@ static void it821x_dma_start(ide_drive_t *drive)
 {
         ide_hwif_t *hwif = drive->hwif;
         struct it821x_dev *itdev = ide_get_hwifdata(hwif);
-        int unit = drive->select.b.unit;
+        u8 unit = drive->dn & 1;
+
         if(itdev->mwdma[unit] != MWDMA_OFF)
                 it821x_program(drive, itdev->mwdma[unit]);
         else if(itdev->udma[unit] != UDMA_OFF && itdev->timing10)
@@ -389,9 +384,10 @@ static void it821x_dma_start(ide_drive_t *drive)
 static int it821x_dma_end(ide_drive_t *drive)
 {
         ide_hwif_t *hwif = drive->hwif;
-        int unit = drive->select.b.unit;
         struct it821x_dev *itdev = ide_get_hwifdata(hwif);
         int ret = __ide_dma_end(drive);
+        u8 unit = drive->dn & 1;
+
         if(itdev->mwdma[unit] != MWDMA_OFF)
                 it821x_program(drive, itdev->pio[unit]);
         return ret;
diff --git a/drivers/ide/pci/ns87415.c b/drivers/ide/pci/ns87415.c
index 99e98e5e271c..61a143661ee0 100644
--- a/drivers/ide/pci/ns87415.c
+++ b/drivers/ide/pci/ns87415.c
@@ -160,8 +160,8 @@ static void ns87415_prepare_drive (ide_drive_t *drive, unsigned int use_dma)
                 new |= bit;
 
         /* Select PIO or DMA, DMA may only be selected for one drive/channel. */
-        bit   = 1 << (20 + drive->select.b.unit       + (hwif->channel << 1));
-        other = 1 << (20 + (1 - drive->select.b.unit) + (hwif->channel << 1));
+        bit   = 1 << (20 + (drive->dn & 1) + (hwif->channel << 1));
+        other = 1 << (20 + (1 - (drive->dn & 1)) + (hwif->channel << 1));
         new = use_dma ? ((new & ~other) | bit) : (new & ~bit);
 
         if (new != *old) {
diff --git a/drivers/ide/pci/opti621.c b/drivers/ide/pci/opti621.c
index 3de11ddcf863..f0db38bd70e3 100644
--- a/drivers/ide/pci/opti621.c
+++ b/drivers/ide/pci/opti621.c
@@ -179,7 +179,7 @@ static void opti621_set_pio_mode(ide_drive_t *drive, const u8 pio)
         misc = addr_timings[clk][addr_pio];
 
         /* select Index-0/1 for Register-A/B */
-        write_reg(drive->select.b.unit, MISC_REG);
+        write_reg(drive->dn & 1, MISC_REG);
         /* set read cycle timings */
         write_reg(tim, READ_REG);
         /* set write cycle timings */
diff --git a/drivers/ide/pci/sc1200.c b/drivers/ide/pci/sc1200.c
index 50405ed6f0cb..79eeeadad655 100644
--- a/drivers/ide/pci/sc1200.c
+++ b/drivers/ide/pci/sc1200.c
@@ -126,7 +126,6 @@ static void sc1200_set_dma_mode(ide_drive_t *drive, const u8 mode)
 {
         ide_hwif_t              *hwif = HWIF(drive);
         struct pci_dev          *dev = to_pci_dev(hwif->dev);
-        int                     unit = drive->select.b.unit;
         unsigned int            reg, timings;
         unsigned short          pci_clock;
         unsigned int            basereg = hwif->channel ? 0x50 : 0x40;
@@ -155,7 +154,7 @@ static void sc1200_set_dma_mode(ide_drive_t *drive, const u8 mode)
         else
                 timings = mwdma_timing[pci_clock][mode - XFER_MW_DMA_0];
 
-        if (unit == 0) {                        /* are we configuring drive0? */
+        if ((drive->dn & 1) == 0) {
                 pci_read_config_dword(dev, basereg + 4, &reg);
                 timings |= reg & 0x80000000;    /* preserve PIO format bit */
                 pci_write_config_dword(dev, basereg + 4, timings);
diff --git a/drivers/ide/pci/scc_pata.c b/drivers/ide/pci/scc_pata.c
index 62fa31409a33..0eced0ae2e86 100644
--- a/drivers/ide/pci/scc_pata.c
+++ b/drivers/ide/pci/scc_pata.c
@@ -291,7 +291,7 @@ static void scc_set_dma_mode(ide_drive_t *drive, const u8 speed)
 static void scc_dma_host_set(ide_drive_t *drive, int on)
 {
         ide_hwif_t *hwif = drive->hwif;
-        u8 unit = (drive->select.b.unit & 0x01);
+        u8 unit = drive->dn & 1;
         u8 dma_stat = scc_ide_inb(hwif->dma_base + 4);
 
         if (on)
diff --git a/drivers/ide/pci/serverworks.c b/drivers/ide/pci/serverworks.c
index 3dff2aea317e..7fac80192f3b 100644
--- a/drivers/ide/pci/serverworks.c
+++ b/drivers/ide/pci/serverworks.c
@@ -153,7 +153,7 @@ static void svwks_set_dma_mode(ide_drive_t *drive, const u8 speed)
 
         ide_hwif_t *hwif        = HWIF(drive);
         struct pci_dev *dev     = to_pci_dev(hwif->dev);
-        u8 unit                 = (drive->select.b.unit & 0x01);
+        u8 unit                 = drive->dn & 1;
 
         u8 ultra_enable  = 0, ultra_timing = 0, dma_timing = 0;
 
diff --git a/drivers/ide/pci/siimage.c b/drivers/ide/pci/siimage.c
index 174a873b4c64..134868c71c34 100644
--- a/drivers/ide/pci/siimage.c
+++ b/drivers/ide/pci/siimage.c
@@ -116,13 +116,14 @@ static inline unsigned long siimage_seldev(ide_drive_t *drive, int r)
 {
         ide_hwif_t *hwif        = HWIF(drive);
         unsigned long base      = (unsigned long)hwif->hwif_data;
+        u8 unit                 = drive->dn & 1;
 
         base += 0xA0 + r;
         if (hwif->host_flags & IDE_HFLAG_MMIO)
                 base += hwif->channel << 6;
         else
                 base += hwif->channel << 4;
-        base |= drive->select.b.unit << drive->select.b.unit;
+        base |= unit << unit;
         return base;
 }
 
@@ -255,7 +256,7 @@ static void sil_set_pio_mode(ide_drive_t *drive, u8 pio)
         u8 addr_mask            = hwif->channel ? (mmio ? 0xF4 : 0x84)
                                                 : (mmio ? 0xB4 : 0x80);
         u8 mode                 = 0;
-        u8 unit                 = drive->select.b.unit;
+        u8 unit                 = drive->dn & 1;
 
         /* trim *taskfile* PIO to the slowest of the master/slave */
         if (pair) {
@@ -301,9 +302,9 @@ static void sil_set_dma_mode(ide_drive_t *drive, const u8 speed)
 
         ide_hwif_t *hwif        = HWIF(drive);
         struct pci_dev *dev     = to_pci_dev(hwif->dev);
-        u16 ultra = 0, multi    = 0;
-        u8 mode = 0, unit       = drive->select.b.unit;
         unsigned long base      = (unsigned long)hwif->hwif_data;
+        u16 ultra = 0, multi    = 0;
+        u8 mode = 0, unit       = drive->dn & 1;
         u8 mmio                 = (hwif->host_flags & IDE_HFLAG_MMIO) ? 1 : 0;
         u8 scsc = 0, addr_mask  = hwif->channel ? (mmio ? 0xF4 : 0x84)
                                                 : (mmio ? 0xB4 : 0x80);
diff --git a/drivers/ide/pci/triflex.c b/drivers/ide/pci/triflex.c
index be8715dcee05..42fb98f268d5 100644
--- a/drivers/ide/pci/triflex.c
+++ b/drivers/ide/pci/triflex.c
@@ -38,13 +38,12 @@ static void triflex_set_mode(ide_drive_t *drive, const u8 speed)
 {
         ide_hwif_t *hwif = HWIF(drive);
         struct pci_dev *dev = to_pci_dev(hwif->dev);
-        u8 channel_offset = hwif->channel ? 0x74 : 0x70;
-        u16 timing = 0;
         u32 triflex_timings = 0;
-        u8 unit = (drive->select.b.unit & 0x01);
-        
+        u16 timing = 0;
+        u8 channel_offset = hwif->channel ? 0x74 : 0x70, unit = drive->dn & 1;
+
         pci_read_config_dword(dev, channel_offset, &triflex_timings);
-        
+
         switch(speed) {
                 case XFER_MW_DMA_2:
                         timing = 0x0103;