ide: use 'drive->dn & 1' instead of drive->select.b.unit

* Call ide_port_init_devices() in ide_host_register()
  also if 'struct ide_port_info *d' is not available.

* Init drive->dn in ide_port_init_devices() instead of
  ide_probe_port() so it is valid also in ->init_dev.

* Pass device number to ide_dev_apply_params().

* Use 'drive->dn & 1' instead of drive->select.b.unit.

There should be no functional changes caused by this patch.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

1 files changed, 16 insertions, 20 deletions

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;