1 files changed, 31 insertions, 55 deletions

diff --git a/drivers/ide/pci/serverworks.c b/drivers/ide/pci/serverworks.c
index d3ffc52e22af..a3d880e21d0b 100644
--- a/drivers/ide/pci/serverworks.c
+++ b/drivers/ide/pci/serverworks.c
@@ -360,23 +360,10 @@ static u8 __devinit ata66_svwks(ide_hwif_t *hwif)
 
 static void __devinit init_hwif_svwks (ide_hwif_t *hwif)
 {
-        if (!hwif->irq)
-                hwif->irq = hwif->channel ? 15 : 14;
-
         hwif->set_pio_mode = &svwks_set_pio_mode;
         hwif->set_dma_mode = &svwks_set_dma_mode;
         hwif->udma_filter = &svwks_udma_filter;
 
-        hwif->atapi_dma = 1;
-
-        if (hwif->pci_dev->device != PCI_DEVICE_ID_SERVERWORKS_OSB4IDE)
-                hwif->ultra_mask = 0x3f;
-
-        hwif->mwdma_mask = 0x07;
-
-        hwif->drives[0].autotune = 1;
-        hwif->drives[1].autotune = 1;
-
         if (!hwif->dma_base)
                 return;
 
@@ -386,72 +373,49 @@ static void __devinit init_hwif_svwks (ide_hwif_t *hwif)
         }
 }
 
-static int __devinit init_setup_svwks (struct pci_dev *dev, ide_pci_device_t *d)
-{
-        return ide_setup_pci_device(dev, d);
-}
-
-static int __devinit init_setup_csb6 (struct pci_dev *dev, ide_pci_device_t *d)
-{
-        if (!(PCI_FUNC(dev->devfn) & 1)) {
-                d->bootable = NEVER_BOARD;
-                if (dev->resource[0].start == 0x01f1)
-                        d->bootable = ON_BOARD;
-        }
-
-        if ((dev->device == PCI_DEVICE_ID_SERVERWORKS_CSB6IDE ||
-            dev->device == PCI_DEVICE_ID_SERVERWORKS_CSB6IDE2) &&
-            (!(PCI_FUNC(dev->devfn) & 1)))
-                d->host_flags |= IDE_HFLAG_SINGLE;
-        else
-                d->host_flags &= ~IDE_HFLAG_SINGLE;
-
-        return ide_setup_pci_device(dev, d);
-}
-
 static ide_pci_device_t serverworks_chipsets[] __devinitdata = {
         {       /* 0 */
                 .name           = "SvrWks OSB4",
-                .init_setup     = init_setup_svwks,
                 .init_chipset   = init_chipset_svwks,
                 .init_hwif      = init_hwif_svwks,
-                .autodma        = AUTODMA,
-                .bootable       = ON_BOARD,
+                .host_flags     = IDE_HFLAG_LEGACY_IRQS | IDE_HFLAG_BOOTABLE,
                 .pio_mask       = ATA_PIO4,
+                .mwdma_mask     = ATA_MWDMA2,
+                .udma_mask      = 0x00, /* UDMA is problematic on OSB4 */
         },{     /* 1 */
                 .name           = "SvrWks CSB5",
-                .init_setup     = init_setup_svwks,
                 .init_chipset   = init_chipset_svwks,
                 .init_hwif      = init_hwif_svwks,
-                .autodma        = AUTODMA,
-                .bootable       = ON_BOARD,
+                .host_flags     = IDE_HFLAG_LEGACY_IRQS | IDE_HFLAG_BOOTABLE,
                 .pio_mask       = ATA_PIO4,
+                .mwdma_mask     = ATA_MWDMA2,
+                .udma_mask      = ATA_UDMA5,
         },{     /* 2 */
                 .name           = "SvrWks CSB6",
-                .init_setup     = init_setup_csb6,
                 .init_chipset   = init_chipset_svwks,
                 .init_hwif      = init_hwif_svwks,
-                .autodma        = AUTODMA,
-                .bootable       = ON_BOARD,
+                .host_flags     = IDE_HFLAG_LEGACY_IRQS | IDE_HFLAG_BOOTABLE,
                 .pio_mask       = ATA_PIO4,
+                .mwdma_mask     = ATA_MWDMA2,
+                .udma_mask      = ATA_UDMA5,
         },{     /* 3 */
                 .name           = "SvrWks CSB6",
-                .init_setup     = init_setup_csb6,
                 .init_chipset   = init_chipset_svwks,
                 .init_hwif      = init_hwif_svwks,
-                .autodma        = AUTODMA,
-                .bootable       = ON_BOARD,
-                .host_flags     = IDE_HFLAG_SINGLE,
+                .host_flags     = IDE_HFLAG_LEGACY_IRQS | IDE_HFLAG_SINGLE |
+                                  IDE_HFLAG_BOOTABLE,
                 .pio_mask       = ATA_PIO4,
+                .mwdma_mask     = ATA_MWDMA2,
+                .udma_mask      = ATA_UDMA5,
         },{     /* 4 */
                 .name           = "SvrWks HT1000",
-                .init_setup     = init_setup_svwks,
                 .init_chipset   = init_chipset_svwks,
                 .init_hwif      = init_hwif_svwks,
-                .autodma        = AUTODMA,
-                .bootable       = ON_BOARD,
-                .host_flags     = IDE_HFLAG_SINGLE,
+                .host_flags     = IDE_HFLAG_LEGACY_IRQS | IDE_HFLAG_SINGLE |
+                                  IDE_HFLAG_BOOTABLE,
                 .pio_mask       = ATA_PIO4,
+                .mwdma_mask     = ATA_MWDMA2,
+                .udma_mask      = ATA_UDMA5,
         }
 };
 
@@ -466,9 +430,21 @@ static ide_pci_device_t serverworks_chipsets[] __devinitdata = {
  
 static int __devinit svwks_init_one(struct pci_dev *dev, const struct pci_device_id *id)
 {
-        ide_pci_device_t *d = &serverworks_chipsets[id->driver_data];
+        ide_pci_device_t d;
+        u8 idx = id->driver_data;
+
+        d = serverworks_chipsets[idx];
+
+        if (idx == 2 || idx == 3) {
+                if ((PCI_FUNC(dev->devfn) & 1) == 0) {
+                        if (pci_resource_start(dev, 0) != 0x01f1)
+                                d.host_flags &= ~IDE_HFLAG_BOOTABLE;
+                        d.host_flags |= IDE_HFLAG_SINGLE;
+                } else
+                        d.host_flags &= ~IDE_HFLAG_SINGLE;
+        }
 
-        return d->init_setup(dev, d);
+        return ide_setup_pci_device(dev, &d);
 }
 
 static const struct pci_device_id svwks_pci_tbl[] = {