1 files changed, 65 insertions, 73 deletions

diff --git a/drivers/ide/pci/via82cxxx.c b/drivers/ide/pci/via82cxxx.c
index 61f1a9665a7f..381cc6f101ce 100644
--- a/drivers/ide/pci/via82cxxx.c
+++ b/drivers/ide/pci/via82cxxx.c
@@ -123,7 +123,7 @@ struct via82cxxx_dev
 static void via_set_speed(ide_hwif_t *hwif, u8 dn, struct ide_timing *timing)
 {
         struct pci_dev *dev = hwif->pci_dev;
-        struct via82cxxx_dev *vdev = ide_get_hwifdata(hwif);
+        struct via82cxxx_dev *vdev = pci_get_drvdata(hwif->pci_dev);
         u8 t;
 
         if (~vdev->via_config->flags & VIA_BAD_AST) {
@@ -162,7 +162,7 @@ static void via_set_speed(ide_hwif_t *hwif, u8 dn, struct ide_timing *timing)
 static int via_set_drive(ide_drive_t *drive, u8 speed)
 {
         ide_drive_t *peer = HWIF(drive)->drives + (~drive->dn & 1);
-        struct via82cxxx_dev *vdev = ide_get_hwifdata(drive->hwif);
+        struct via82cxxx_dev *vdev = pci_get_drvdata(drive->hwif->pci_dev);
         struct ide_timing t, p;
         unsigned int T, UT;
 
@@ -225,7 +225,7 @@ static void via82cxxx_tune_drive(ide_drive_t *drive, u8 pio)
 static int via82cxxx_ide_dma_check (ide_drive_t *drive)
 {
         ide_hwif_t *hwif = HWIF(drive);
-        struct via82cxxx_dev *vdev = ide_get_hwifdata(hwif);
+        struct via82cxxx_dev *vdev = pci_get_drvdata(hwif->pci_dev);
         u16 w80 = hwif->udma_four;
 
         u16 speed = ide_find_best_mode(drive,
@@ -262,6 +262,53 @@ static struct via_isa_bridge *via_config_find(struct pci_dev **isa)
         return via_config;
 }
 
+/*
+ * Check and handle 80-wire cable presence
+ */
+static void __devinit via_cable_detect(struct via82cxxx_dev *vdev, u32 u)
+{
+        int i;
+
+        switch (vdev->via_config->flags & VIA_UDMA) {
+                case VIA_UDMA_66:
+                        for (i = 24; i >= 0; i -= 8)
+                                if (((u >> (i & 16)) & 8) &&
+                                    ((u >> i) & 0x20) &&
+                                     (((u >> i) & 7) < 2)) {
+                                        /*
+                                         * 2x PCI clock and
+                                         * UDMA w/ < 3T/cycle
+                                         */
+                                        vdev->via_80w |= (1 << (1 - (i >> 4)));
+                                }
+                        break;
+
+                case VIA_UDMA_100:
+                        for (i = 24; i >= 0; i -= 8)
+                                if (((u >> i) & 0x10) ||
+                                    (((u >> i) & 0x20) &&
+                                     (((u >> i) & 7) < 4))) {
+                                        /* BIOS 80-wire bit or
+                                         * UDMA w/ < 60ns/cycle
+                                         */
+                                        vdev->via_80w |= (1 << (1 - (i >> 4)));
+                                }
+                        break;
+
+                case VIA_UDMA_133:
+                        for (i = 24; i >= 0; i -= 8)
+                                if (((u >> i) & 0x10) ||
+                                    (((u >> i) & 0x20) &&
+                                     (((u >> i) & 7) < 6))) {
+                                        /* BIOS 80-wire bit or
+                                         * UDMA w/ < 60ns/cycle
+                                         */
+                                        vdev->via_80w |= (1 << (1 - (i >> 4)));
+                                }
+                        break;
+        }
+}
+
 /**
  *      init_chipset_via82cxxx  -       initialization handler
  *      @dev: PCI device
@@ -274,14 +321,22 @@ static struct via_isa_bridge *via_config_find(struct pci_dev **isa)
 static unsigned int __devinit init_chipset_via82cxxx(struct pci_dev *dev, const char *name)
 {
         struct pci_dev *isa = NULL;
+        struct via82cxxx_dev *vdev;
         struct via_isa_bridge *via_config;
         u8 t, v;
-        unsigned int u;
+        u32 u;
+
+        vdev = kzalloc(sizeof(*vdev), GFP_KERNEL);
+        if (!vdev) {
+                printk(KERN_ERR "VP_IDE: out of memory :(\n");
+                return -ENOMEM;
+        }
+        pci_set_drvdata(dev, vdev);
 
         /*
          * Find the ISA bridge to see how good the IDE is.
          */
-        via_config = via_config_find(&isa);
+        vdev->via_config = via_config = via_config_find(&isa);
 
         /* We checked this earlier so if it fails here deeep badness
            is involved */
@@ -289,16 +344,17 @@ static unsigned int __devinit init_chipset_via82cxxx(struct pci_dev *dev, const
         BUG_ON(!via_config->id);
 
         /*
-         * Setup or disable Clk66 if appropriate
+         * Detect cable and configure Clk66
          */
+        pci_read_config_dword(dev, VIA_UDMA_TIMING, &u);
+
+        via_cable_detect(vdev, u);
 
         if ((via_config->flags & VIA_UDMA) == VIA_UDMA_66) {
                 /* Enable Clk66 */
-                pci_read_config_dword(dev, VIA_UDMA_TIMING, &u);
                 pci_write_config_dword(dev, VIA_UDMA_TIMING, u|0x80008);
         } else if (via_config->flags & VIA_BAD_CLK66) {
                 /* Would cause trouble on 596a and 686 */
-                pci_read_config_dword(dev, VIA_UDMA_TIMING, &u);
                 pci_write_config_dword(dev, VIA_UDMA_TIMING, u & ~0x80008);
         }
 
@@ -367,75 +423,11 @@ static unsigned int __devinit init_chipset_via82cxxx(struct pci_dev *dev, const
         return 0;
 }
 
-/*
- * Check and handle 80-wire cable presence
- */
-static void __devinit via_cable_detect(struct pci_dev *dev, struct via82cxxx_dev *vdev)
-{
-        unsigned int u;
-        int i;
-        pci_read_config_dword(dev, VIA_UDMA_TIMING, &u);
-
-        switch (vdev->via_config->flags & VIA_UDMA) {
-
-                case VIA_UDMA_66:
-                        for (i = 24; i >= 0; i -= 8)
-                                if (((u >> (i & 16)) & 8) &&
-                                    ((u >> i) & 0x20) &&
-                                     (((u >> i) & 7) < 2)) {
-                                        /*
-                                         * 2x PCI clock and
-                                         * UDMA w/ < 3T/cycle
-                                         */
-                                        vdev->via_80w |= (1 << (1 - (i >> 4)));
-                                }
-                        break;
-
-                case VIA_UDMA_100:
-                        for (i = 24; i >= 0; i -= 8)
-                                if (((u >> i) & 0x10) ||
-                                    (((u >> i) & 0x20) &&
-                                     (((u >> i) & 7) < 4))) {
-                                        /* BIOS 80-wire bit or
-                                         * UDMA w/ < 60ns/cycle
-                                         */
-                                        vdev->via_80w |= (1 << (1 - (i >> 4)));
-                                }
-                        break;
-
-                case VIA_UDMA_133:
-                        for (i = 24; i >= 0; i -= 8)
-                                if (((u >> i) & 0x10) ||
-                                    (((u >> i) & 0x20) &&
-                                     (((u >> i) & 7) < 6))) {
-                                        /* BIOS 80-wire bit or
-                                         * UDMA w/ < 60ns/cycle
-                                         */
-                                        vdev->via_80w |= (1 << (1 - (i >> 4)));
-                                }
-                        break;
-
-        }
-}
-
 static void __devinit init_hwif_via82cxxx(ide_hwif_t *hwif)
 {
-        struct via82cxxx_dev *vdev = kmalloc(sizeof(struct via82cxxx_dev),
-                GFP_KERNEL);
-        struct pci_dev *isa = NULL;
+        struct via82cxxx_dev *vdev = pci_get_drvdata(hwif->pci_dev);
         int i;
 
-        if (vdev == NULL) {
-                printk(KERN_ERR "VP_IDE: out of memory :(\n");
-                return;
-        }
-
-        memset(vdev, 0, sizeof(struct via82cxxx_dev));
-        ide_set_hwifdata(hwif, vdev);
-
-        vdev->via_config = via_config_find(&isa);
-        via_cable_detect(hwif->pci_dev, vdev);
-
         hwif->autodma = 0;
 
         hwif->tuneproc = &via82cxxx_tune_drive;