Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: (95 commits)
  ide-tape: remove idetape_config_t typedef
  ide-tape: remove mtio.h related comments
  ide-tape: make function name more accurate
  ide-tape: remove unused sense packet commands.
  ide-tape: use generic byteorder macros
  ide-tape: remove EXPERIMENTAL driver status
  ide-tape: use generic scsi commands
  ide-tape: remove struct idetape_block_size_page_t
  ide-tape: remove structs os_partition_t, os_dat_entry_t, os_dat_t
  ide-tape: remove struct idetape_parameter_block_descriptor_t
  ide-tape: remove struct idetape_medium_partition_page_t
  ide-tape: remove struct idetape_data_compression_page_t
  ide-tape: remove struct idetape_inquiry_result_t
  ide-tape: remove struct idetape_capabilities_page_t
  ide-tape: remove IDETAPE_DEBUG_BUGS
  ide-tape: remove IDETAPE_DEBUG_INFO
  ide-tape: dump gcw fields on error in idetape_identify_device()
  ide-tape: remove struct idetape_mode_parameter_header_t
  ide-tape: remove struct idetape_request_sense_result_t
  ide-tape: remove dead code
  ...

35 files changed, 237 insertions, 342 deletions

diff --git a/drivers/ide/pci/aec62xx.c b/drivers/ide/pci/aec62xx.c
index 824df78c7012..cfb3265bc1a8 100644
--- a/drivers/ide/pci/aec62xx.c
+++ b/drivers/ide/pci/aec62xx.c
@@ -7,7 +7,6 @@
 #include <linux/module.h>
 #include <linux/types.h>
 #include <linux/pci.h>
-#include <linux/delay.h>
 #include <linux/hdreg.h>
 #include <linux/ide.h>
 #include <linux/init.h>
@@ -166,6 +165,16 @@ static unsigned int __devinit init_chipset_aec62xx(struct pci_dev *dev, const ch
         return dev->irq;
 }
 
+static u8 __devinit atp86x_cable_detect(ide_hwif_t *hwif)
+{
+        struct pci_dev *dev = to_pci_dev(hwif->dev);
+        u8 ata66 = 0, mask = hwif->channel ? 0x02 : 0x01;
+
+        pci_read_config_byte(dev, 0x49, &ata66);
+
+        return (ata66 & mask) ? ATA_CBL_PATA40 : ATA_CBL_PATA80;
+}
+
 static void __devinit init_hwif_aec62xx(ide_hwif_t *hwif)
 {
         struct pci_dev *dev = to_pci_dev(hwif->dev);
@@ -174,21 +183,10 @@ static void __devinit init_hwif_aec62xx(ide_hwif_t *hwif)
 
         if (dev->device == PCI_DEVICE_ID_ARTOP_ATP850UF)
                 hwif->set_dma_mode = &aec6210_set_mode;
-        else
+        else {
                 hwif->set_dma_mode = &aec6260_set_mode;
 
-        if (hwif->dma_base == 0)
-                return;
-
-        if (dev->device == PCI_DEVICE_ID_ARTOP_ATP850UF)
-                return;
-
-        if (hwif->cbl != ATA_CBL_PATA40_SHORT) {
-                u8 ata66 = 0, mask = hwif->channel ? 0x02 : 0x01;
-
-                pci_read_config_byte(dev, 0x49, &ata66);
-
-                hwif->cbl = (ata66 & mask) ? ATA_CBL_PATA40 : ATA_CBL_PATA80;
+                hwif->cable_detect = atp86x_cable_detect;
         }
 }
 
diff --git a/drivers/ide/pci/alim15x3.c b/drivers/ide/pci/alim15x3.c
index 130cc6e784e5..b3b6f514ce2d 100644
--- a/drivers/ide/pci/alim15x3.c
+++ b/drivers/ide/pci/alim15x3.c
@@ -31,7 +31,6 @@
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/pci.h>
-#include <linux/delay.h>
 #include <linux/hdreg.h>
 #include <linux/ide.h>
 #include <linux/init.h>
@@ -666,13 +665,12 @@ static void __devinit init_hwif_common_ali15x3 (ide_hwif_t *hwif)
         hwif->set_dma_mode = &ali_set_dma_mode;
         hwif->udma_filter = &ali_udma_filter;
 
+        hwif->cable_detect = ata66_ali15x3;
+
         if (hwif->dma_base == 0)
                 return;
 
         hwif->dma_setup = &ali15x3_dma_setup;
-
-        if (hwif->cbl != ATA_CBL_PATA40_SHORT)
-                hwif->cbl = ata66_ali15x3(hwif);
 }
 
 /**
diff --git a/drivers/ide/pci/amd74xx.c b/drivers/ide/pci/amd74xx.c
index 8c52bc9eaa59..2ef890ce8097 100644
--- a/drivers/ide/pci/amd74xx.c
+++ b/drivers/ide/pci/amd74xx.c
@@ -17,12 +17,9 @@
 
 #include <linux/module.h>
 #include <linux/kernel.h>
-#include <linux/ioport.h>
-#include <linux/blkdev.h>
 #include <linux/pci.h>
 #include <linux/init.h>
 #include <linux/ide.h>
-#include <asm/io.h>
 
 #include "ide-timing.h"
 
@@ -199,6 +196,14 @@ static unsigned int __devinit init_chipset_amd74xx(struct pci_dev *dev,
         return dev->irq;
 }
 
+static u8 __devinit amd_cable_detect(ide_hwif_t *hwif)
+{
+        if ((amd_80w >> hwif->channel) & 1)
+                return ATA_CBL_PATA80;
+        else
+                return ATA_CBL_PATA40;
+}
+
 static void __devinit init_hwif_amd74xx(ide_hwif_t *hwif)
 {
         struct pci_dev *dev = to_pci_dev(hwif->dev);
@@ -209,15 +214,7 @@ static void __devinit init_hwif_amd74xx(ide_hwif_t *hwif)
         hwif->set_pio_mode = &amd_set_pio_mode;
         hwif->set_dma_mode = &amd_set_drive;
 
-        if (!hwif->dma_base)
-                return;
-
-        if (hwif->cbl != ATA_CBL_PATA40_SHORT) {
-                if ((amd_80w >> hwif->channel) & 1)
-                        hwif->cbl = ATA_CBL_PATA80;
-                else
-                        hwif->cbl = ATA_CBL_PATA40;
-        }
+        hwif->cable_detect = amd_cable_detect;
 }
 
 #define IDE_HFLAGS_AMD \
diff --git a/drivers/ide/pci/atiixp.c b/drivers/ide/pci/atiixp.c
index b56274af1782..7e037c880cb0 100644
--- a/drivers/ide/pci/atiixp.c
+++ b/drivers/ide/pci/atiixp.c
@@ -6,15 +6,11 @@
 #include <linux/types.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
-#include <linux/ioport.h>
 #include <linux/pci.h>
 #include <linux/hdreg.h>
 #include <linux/ide.h>
-#include <linux/delay.h>
 #include <linux/init.h>
 
-#include <asm/io.h>
-
 #define ATIIXP_IDE_PIO_TIMING           0x40
 #define ATIIXP_IDE_MDMA_TIMING          0x44
 #define ATIIXP_IDE_PIO_CONTROL          0x48
@@ -121,6 +117,19 @@ static void atiixp_set_dma_mode(ide_drive_t *drive, const u8 speed)
         spin_unlock_irqrestore(&atiixp_lock, flags);
 }
 
+static u8 __devinit atiixp_cable_detect(ide_hwif_t *hwif)
+{
+        struct pci_dev *pdev = to_pci_dev(hwif->dev);
+        u8 udma_mode = 0, ch = hwif->channel;
+
+        pci_read_config_byte(pdev, ATIIXP_IDE_UDMA_MODE + ch, &udma_mode);
+
+        if ((udma_mode & 0x07) >= 0x04 || (udma_mode & 0x70) >= 0x40)
+                return ATA_CBL_PATA80;
+        else
+                return ATA_CBL_PATA40;
+}
+
 /**
  *      init_hwif_atiixp                -       fill in the hwif for the ATIIXP
  *      @hwif: IDE interface
@@ -131,21 +140,10 @@ static void atiixp_set_dma_mode(ide_drive_t *drive, const u8 speed)
 
 static void __devinit init_hwif_atiixp(ide_hwif_t *hwif)
 {
-        struct pci_dev *pdev = to_pci_dev(hwif->dev);
-        u8 udma_mode = 0, ch = hwif->channel;
-
         hwif->set_pio_mode = &atiixp_set_pio_mode;
         hwif->set_dma_mode = &atiixp_set_dma_mode;
 
-        if (!hwif->dma_base)
-                return;
-
-        pci_read_config_byte(pdev, ATIIXP_IDE_UDMA_MODE + ch, &udma_mode);
-
-        if ((udma_mode & 0x07) >= 0x04 || (udma_mode & 0x70) >= 0x40)
-                hwif->cbl = ATA_CBL_PATA80;
-        else
-                hwif->cbl = ATA_CBL_PATA40;
+        hwif->cable_detect = atiixp_cable_detect;
 }
 
 static const struct ide_port_info atiixp_pci_info[] __devinitdata = {
diff --git a/drivers/ide/pci/cmd640.c b/drivers/ide/pci/cmd640.c
index 7240c20b9593..bd24dad3cfc6 100644
--- a/drivers/ide/pci/cmd640.c
+++ b/drivers/ide/pci/cmd640.c
@@ -103,10 +103,6 @@
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/delay.h>
-#include <linux/timer.h>
-#include <linux/mm.h>
-#include <linux/ioport.h>
-#include <linux/blkdev.h>
 #include <linux/hdreg.h>
 #include <linux/ide.h>
 #include <linux/init.h>
@@ -703,6 +699,18 @@ static int pci_conf2(void)
         return 0;
 }
 
+static const struct ide_port_info cmd640_port_info __initdata = {
+        .chipset                = ide_cmd640,
+        .host_flags             = IDE_HFLAG_SERIALIZE |
+                                  IDE_HFLAG_NO_DMA |
+                                  IDE_HFLAG_NO_AUTOTUNE |
+                                  IDE_HFLAG_ABUSE_PREFETCH |
+                                  IDE_HFLAG_ABUSE_FAST_DEVSEL,
+#ifdef CONFIG_BLK_DEV_CMD640_ENHANCED
+        .pio_mask               = ATA_PIO5,
+#endif
+};
+
 /*
  * Probe for a cmd640 chipset, and initialize it if found.
  */
@@ -760,11 +768,7 @@ static int __init cmd640x_init(void)
         setup_device_ptrs ();
         printk("%s: buggy cmd640%c interface on %s, config=0x%02x\n",
                cmd_hwif0->name, 'a' + cmd640_chip_version - 1, bus_type, cfr);
-        cmd_hwif0->chipset = ide_cmd640;
 #ifdef CONFIG_BLK_DEV_CMD640_ENHANCED
-        cmd_hwif0->host_flags = IDE_HFLAG_ABUSE_PREFETCH |
-                                IDE_HFLAG_ABUSE_FAST_DEVSEL;
-        cmd_hwif0->pio_mask = ATA_PIO5;
         cmd_hwif0->set_pio_mode = &cmd640_set_pio_mode;
 #endif /* CONFIG_BLK_DEV_CMD640_ENHANCED */
 
@@ -815,23 +819,14 @@ static int __init cmd640x_init(void)
          * Initialize data for secondary cmd640 port, if enabled
          */
         if (second_port_cmd640) {
-                cmd_hwif0->serialized = 1;
-                cmd_hwif1->serialized = 1;
-                cmd_hwif1->chipset = ide_cmd640;
-                cmd_hwif0->mate = cmd_hwif1;
-                cmd_hwif1->mate = cmd_hwif0;
-                cmd_hwif1->channel = 1;
 #ifdef CONFIG_BLK_DEV_CMD640_ENHANCED
-                cmd_hwif1->host_flags = IDE_HFLAG_ABUSE_PREFETCH |
-                                        IDE_HFLAG_ABUSE_FAST_DEVSEL;
-                cmd_hwif1->pio_mask = ATA_PIO5;
                 cmd_hwif1->set_pio_mode = &cmd640_set_pio_mode;
 #endif /* CONFIG_BLK_DEV_CMD640_ENHANCED */
 
                 idx[1] = cmd_hwif1->index;
         }
         printk(KERN_INFO "%s: %sserialized, secondary interface %s\n", cmd_hwif1->name,
-                cmd_hwif0->serialized ? "" : "not ", port2);
+                         second_port_cmd640 ? "" : "not ", port2);
 
         /*
          * Establish initial timings/prefetch for all drives.
@@ -876,7 +871,7 @@ static int __init cmd640x_init(void)
         cmd640_dump_regs();
 #endif
 
-        ide_device_add(idx);
+        ide_device_add(idx, &cmd640_port_info);
 
         return 1;
 }
diff --git a/drivers/ide/pci/cmd64x.c b/drivers/ide/pci/cmd64x.c
index 04aa9e59670e..edabe6299efd 100644
--- a/drivers/ide/pci/cmd64x.c
+++ b/drivers/ide/pci/cmd64x.c
@@ -13,7 +13,6 @@
 #include <linux/module.h>
 #include <linux/types.h>
 #include <linux/pci.h>
-#include <linux/delay.h>
 #include <linux/hdreg.h>
 #include <linux/ide.h>
 #include <linux/init.h>
@@ -393,6 +392,8 @@ static void __devinit init_hwif_cmd64x(ide_hwif_t *hwif)
         hwif->set_pio_mode = &cmd64x_set_pio_mode;
         hwif->set_dma_mode = &cmd64x_set_dma_mode;
 
+        hwif->cable_detect = ata66_cmd64x;
+
         if (!hwif->dma_base)
                 return;
 
@@ -411,9 +412,6 @@ static void __devinit init_hwif_cmd64x(ide_hwif_t *hwif)
         if (dev->device == PCI_DEVICE_ID_CMD_646 && dev->revision < 5)
                 hwif->ultra_mask = 0x00;
 
-        if (hwif->cbl != ATA_CBL_PATA40_SHORT)
-                hwif->cbl = ata66_cmd64x(hwif);
-
         switch (dev->device) {
         case PCI_DEVICE_ID_CMD_648:
         case PCI_DEVICE_ID_CMD_649:
diff --git a/drivers/ide/pci/cs5520.c b/drivers/ide/pci/cs5520.c
index eb68a9ad0c98..0be1a824102b 100644
--- a/drivers/ide/pci/cs5520.c
+++ b/drivers/ide/pci/cs5520.c
@@ -35,22 +35,12 @@
 #include <linux/module.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
-#include <linux/delay.h>
-#include <linux/timer.h>
-#include <linux/mm.h>
-#include <linux/ioport.h>
-#include <linux/blkdev.h>
 #include <linux/hdreg.h>
-
-#include <linux/interrupt.h>
 #include <linux/init.h>
 #include <linux/pci.h>
 #include <linux/ide.h>
 #include <linux/dma-mapping.h>
 
-#include <asm/io.h>
-#include <asm/irq.h>
-
 struct pio_clocks
 {
         int address;
@@ -180,7 +170,7 @@ static int __devinit cs5520_init_one(struct pci_dev *dev, const struct pci_devic
 
         ide_pci_setup_ports(dev, d, 14, &idx[0]);
 
-        ide_device_add(idx);
+        ide_device_add(idx, d);
 
         return 0;
 }
diff --git a/drivers/ide/pci/cs5530.c b/drivers/ide/pci/cs5530.c
index 765aac397ced..941a1344820b 100644
--- a/drivers/ide/pci/cs5530.c
+++ b/drivers/ide/pci/cs5530.c
@@ -15,18 +15,12 @@
 #include <linux/module.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
-#include <linux/delay.h>
-#include <linux/timer.h>
-#include <linux/mm.h>
-#include <linux/ioport.h>
-#include <linux/blkdev.h>
 #include <linux/hdreg.h>
-#include <linux/interrupt.h>
 #include <linux/pci.h>
 #include <linux/init.h>
 #include <linux/ide.h>
+
 #include <asm/io.h>
-#include <asm/irq.h>
 
 /*
  * Here are the standard PIO mode 0-4 timings for each "format".
diff --git a/drivers/ide/pci/cs5535.c b/drivers/ide/pci/cs5535.c
index 66433aa53f59..d7b5ea992e94 100644
--- a/drivers/ide/pci/cs5535.c
+++ b/drivers/ide/pci/cs5535.c
@@ -155,8 +155,9 @@ static void cs5535_set_pio_mode(ide_drive_t *drive, const u8 pio)
         cs5535_set_speed(drive, XFER_PIO_0 + pio);
 }
 
-static u8 __devinit cs5535_cable_detect(struct pci_dev *dev)
+static u8 __devinit cs5535_cable_detect(ide_hwif_t *hwif)
 {
+        struct pci_dev *dev = to_pci_dev(hwif->dev);
         u8 bit;
 
         /* if a 80 wire cable was detected */
@@ -175,15 +176,10 @@ static u8 __devinit cs5535_cable_detect(struct pci_dev *dev)
  */
 static void __devinit init_hwif_cs5535(ide_hwif_t *hwif)
 {
-        struct pci_dev *dev = to_pci_dev(hwif->dev);
-
         hwif->set_pio_mode = &cs5535_set_pio_mode;
         hwif->set_dma_mode = &cs5535_set_dma_mode;
 
-        if (hwif->dma_base == 0)
-                return;
-
-        hwif->cbl = cs5535_cable_detect(dev);
+        hwif->cable_detect = cs5535_cable_detect;
 }
 
 static const struct ide_port_info cs5535_chipset __devinitdata = {
diff --git a/drivers/ide/pci/cy82c693.c b/drivers/ide/pci/cy82c693.c
index 50100ac8770f..724cbacf4e5b 100644
--- a/drivers/ide/pci/cy82c693.c
+++ b/drivers/ide/pci/cy82c693.c
@@ -45,7 +45,6 @@
 #include <linux/module.h>
 #include <linux/types.h>
 #include <linux/pci.h>
-#include <linux/delay.h>
 #include <linux/ide.h>
 #include <linux/init.h>
 
diff --git a/drivers/ide/pci/delkin_cb.c b/drivers/ide/pci/delkin_cb.c
index 27e47fc97100..3f9cd64c26a6 100644
--- a/drivers/ide/pci/delkin_cb.c
+++ b/drivers/ide/pci/delkin_cb.c
@@ -16,15 +16,14 @@
  *  License.  See the file COPYING in the main directory of this archive for
  *  more details.
  */
-#include <linux/autoconf.h>
+
 #include <linux/types.h>
 #include <linux/module.h>
-#include <linux/mm.h>
-#include <linux/blkdev.h>
 #include <linux/hdreg.h>
 #include <linux/ide.h>
 #include <linux/init.h>
 #include <linux/pci.h>
+
 #include <asm/io.h>
 
 /*
@@ -52,6 +51,7 @@ delkin_cb_probe (struct pci_dev *dev, const struct pci_device_id *id)
         ide_hwif_t *hwif = NULL;
         ide_drive_t *drive;
         int i, rc;
+        u8 idx[4] = { 0xff, 0xff, 0xff, 0xff };
 
         rc = pci_enable_device(dev);
         if (rc) {
@@ -78,12 +78,27 @@ delkin_cb_probe (struct pci_dev *dev, const struct pci_device_id *id)
         hw.irq = dev->irq;
         hw.chipset = ide_pci;           /* this enables IRQ sharing */
 
-        rc = ide_register_hw(&hw, &ide_undecoded_slave, &hwif);
-        if (rc < 0) {
-                printk(KERN_ERR "delkin_cb: ide_register_hw failed (%d)\n", rc);
-                pci_disable_device(dev);
-                return -ENODEV;
-        }
+        hwif = ide_deprecated_find_port(hw.io_ports[IDE_DATA_OFFSET]);
+        if (hwif == NULL)
+                goto out_disable;
+
+        i = hwif->index;
+
+        if (hwif->present)
+                ide_unregister(i, 0, 0);
+        else if (!hwif->hold)
+                ide_init_port_data(hwif, i);
+
+        ide_init_port_hw(hwif, &hw);
+        hwif->quirkproc = &ide_undecoded_slave;
+
+        idx[0] = i;
+
+        ide_device_add(idx, NULL);
+
+        if (!hwif->present)
+                goto out_disable;
+
         pci_set_drvdata(dev, hwif);
         hwif->dev = &dev->dev;
         drive = &hwif->drives[0];
@@ -92,6 +107,11 @@ delkin_cb_probe (struct pci_dev *dev, const struct pci_device_id *id)
                 drive->unmask   = 1;
         }
         return 0;
+
+out_disable:
+        printk(KERN_ERR "delkin_cb: no IDE devices found\n");
+        pci_disable_device(dev);
+        return -ENODEV;
 }
 
 static void
@@ -100,7 +120,8 @@ delkin_cb_remove (struct pci_dev *dev)
         ide_hwif_t *hwif = pci_get_drvdata(dev);
 
         if (hwif)
-                ide_unregister(hwif->index);
+                ide_unregister(hwif->index, 0, 0);
+
         pci_disable_device(dev);
 }
 
diff --git a/drivers/ide/pci/generic.c b/drivers/ide/pci/generic.c
index 59ebe84f1053..9262a9174b4e 100644
--- a/drivers/ide/pci/generic.c
+++ b/drivers/ide/pci/generic.c
@@ -22,18 +22,11 @@
 #include <linux/types.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
-#include <linux/delay.h>
-#include <linux/timer.h>
-#include <linux/mm.h>
-#include <linux/ioport.h>
-#include <linux/blkdev.h>
 #include <linux/hdreg.h>
 #include <linux/pci.h>
 #include <linux/ide.h>
 #include <linux/init.h>
 
-#include <asm/io.h>
-
 static int ide_generic_all;             /* Set to claim all devices */
 
 /*
diff --git a/drivers/ide/pci/hpt34x.c b/drivers/ide/pci/hpt34x.c
index 25dbb814822d..9f01da46b016 100644
--- a/drivers/ide/pci/hpt34x.c
+++ b/drivers/ide/pci/hpt34x.c
@@ -26,20 +26,13 @@
 #include <linux/module.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
-#include <linux/delay.h>
-#include <linux/timer.h>
-#include <linux/mm.h>
 #include <linux/ioport.h>
-#include <linux/blkdev.h>
 #include <linux/hdreg.h>
 #include <linux/interrupt.h>
 #include <linux/pci.h>
 #include <linux/init.h>
 #include <linux/ide.h>
 
-#include <asm/io.h>
-#include <asm/irq.h>
-
 #define HPT343_DEBUG_DRIVE_INFO         0
 
 static void hpt34x_set_mode(ide_drive_t *drive, const u8 speed)
diff --git a/drivers/ide/pci/hpt366.c b/drivers/ide/pci/hpt366.c
index 5623cad569da..d0f7bb8b8adf 100644
--- a/drivers/ide/pci/hpt366.c
+++ b/drivers/ide/pci/hpt366.c
@@ -121,12 +121,8 @@
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/delay.h>
-#include <linux/timer.h>
-#include <linux/mm.h>
-#include <linux/ioport.h>
 #include <linux/blkdev.h>
 #include <linux/hdreg.h>
-
 #include <linux/interrupt.h>
 #include <linux/pci.h>
 #include <linux/init.h>
@@ -134,7 +130,6 @@
 
 #include <asm/uaccess.h>
 #include <asm/io.h>
-#include <asm/irq.h>
 
 /* various tuning parameters */
 #define HPT_RESET_STATE_ENGINE
@@ -1279,12 +1274,55 @@ static unsigned int __devinit init_chipset_hpt366(struct pci_dev *dev, const cha
         return dev->irq;
 }
 
+static u8 __devinit hpt3xx_cable_detect(ide_hwif_t *hwif)
+{
+        struct pci_dev  *dev    = to_pci_dev(hwif->dev);
+        struct hpt_info *info   = pci_get_drvdata(dev);
+        u8 chip_type            = info->chip_type;
+        u8 scr1 = 0, ata66      = hwif->channel ? 0x01 : 0x02;
+
+        /*
+         * The HPT37x uses the CBLID pins as outputs for MA15/MA16
+         * address lines to access an external EEPROM.  To read valid
+         * cable detect state the pins must be enabled as inputs.
+         */
+        if (chip_type == HPT374 && (PCI_FUNC(dev->devfn) & 1)) {
+                /*
+                 * HPT374 PCI function 1
+                 * - set bit 15 of reg 0x52 to enable TCBLID as input
+                 * - set bit 15 of reg 0x56 to enable FCBLID as input
+                 */
+                u8  mcr_addr = hwif->select_data + 2;
+                u16 mcr;
+
+                pci_read_config_word(dev, mcr_addr, &mcr);
+                pci_write_config_word(dev, mcr_addr, (mcr | 0x8000));
+                /* now read cable id register */
+                pci_read_config_byte(dev, 0x5a, &scr1);
+                pci_write_config_word(dev, mcr_addr, mcr);
+        } else if (chip_type >= HPT370) {
+                /*
+                 * HPT370/372 and 374 pcifn 0
+                 * - clear bit 0 of reg 0x5b to enable P/SCBLID as inputs
+                 */
+                u8 scr2 = 0;
+
+                pci_read_config_byte(dev, 0x5b, &scr2);
+                pci_write_config_byte(dev, 0x5b, (scr2 & ~1));
+                /* now read cable id register */
+                pci_read_config_byte(dev, 0x5a, &scr1);
+                pci_write_config_byte(dev, 0x5b,  scr2);
+        } else
+                pci_read_config_byte(dev, 0x5a, &scr1);
+
+        return (scr1 & ata66) ? ATA_CBL_PATA40 : ATA_CBL_PATA80;
+}
+
 static void __devinit init_hwif_hpt366(ide_hwif_t *hwif)
 {
         struct pci_dev *dev     = to_pci_dev(hwif->dev);
         struct hpt_info *info   = pci_get_drvdata(dev);
         int serialize           = HPT_SERIALIZE_IO;
-        u8  scr1 = 0, ata66     = hwif->channel ? 0x01 : 0x02;
         u8  chip_type           = info->chip_type;
         u8  new_mcr, old_mcr    = 0;
 
@@ -1301,6 +1339,8 @@ static void __devinit init_hwif_hpt366(ide_hwif_t *hwif)
         hwif->udma_filter       = &hpt3xx_udma_filter;
         hwif->mdma_filter       = &hpt3xx_mdma_filter;
 
+        hwif->cable_detect      = hpt3xx_cable_detect;
+
         /*
          * HPT3xxN chips have some complications:
          *
@@ -1346,43 +1386,6 @@ static void __devinit init_hwif_hpt366(ide_hwif_t *hwif)
         if (hwif->dma_base == 0)
                 return;
 
-        /*
-         * The HPT37x uses the CBLID pins as outputs for MA15/MA16
-         * address lines to access an external EEPROM.  To read valid
-         * cable detect state the pins must be enabled as inputs.
-         */
-        if (chip_type == HPT374 && (PCI_FUNC(dev->devfn) & 1)) {
-                /*
-                 * HPT374 PCI function 1
-                 * - set bit 15 of reg 0x52 to enable TCBLID as input
-                 * - set bit 15 of reg 0x56 to enable FCBLID as input
-                 */
-                u8  mcr_addr = hwif->select_data + 2;
-                u16 mcr;
-
-                pci_read_config_word (dev, mcr_addr, &mcr);
-                pci_write_config_word(dev, mcr_addr, (mcr | 0x8000));
-                /* now read cable id register */
-                pci_read_config_byte (dev, 0x5a, &scr1);
-                pci_write_config_word(dev, mcr_addr, mcr);
-        } else if (chip_type >= HPT370) {
-                /*
-                 * HPT370/372 and 374 pcifn 0
-                 * - clear bit 0 of reg 0x5b to enable P/SCBLID as inputs
-                 */
-                u8 scr2 = 0;
-
-                pci_read_config_byte (dev, 0x5b, &scr2);
-                pci_write_config_byte(dev, 0x5b, (scr2 & ~1));
-                /* now read cable id register */
-                pci_read_config_byte (dev, 0x5a, &scr1);
-                pci_write_config_byte(dev, 0x5b,  scr2);
-        } else
-                pci_read_config_byte (dev, 0x5a, &scr1);
-
-        if (hwif->cbl != ATA_CBL_PATA40_SHORT)
-                hwif->cbl = (scr1 & ata66) ? ATA_CBL_PATA40 : ATA_CBL_PATA80;
-
         if (chip_type >= HPT374) {
                 hwif->ide_dma_test_irq  = &hpt374_ide_dma_test_irq;
                 hwif->ide_dma_end       = &hpt374_ide_dma_end;
diff --git a/drivers/ide/pci/it8213.c b/drivers/ide/pci/it8213.c
index df74e588a530..e3427eaab430 100644
--- a/drivers/ide/pci/it8213.c
+++ b/drivers/ide/pci/it8213.c
@@ -10,13 +10,10 @@
 #include <linux/types.h>
 #include <linux/module.h>
 #include <linux/pci.h>
-#include <linux/delay.h>
 #include <linux/hdreg.h>
 #include <linux/ide.h>
 #include <linux/init.h>
 
-#include <asm/io.h>
-
 /**
  *      it8213_set_pio_mode     -       set host controller for PIO mode
  *      @drive: drive
@@ -143,6 +140,16 @@ static void it8213_set_dma_mode(ide_drive_t *drive, const u8 speed)
         }
 }
 
+static u8 __devinit it8213_cable_detect(ide_hwif_t *hwif)
+{
+        struct pci_dev *dev = to_pci_dev(hwif->dev);
+        u8 reg42h = 0;
+
+        pci_read_config_byte(dev, 0x42, &reg42h);
+
+        return (reg42h & 0x02) ? ATA_CBL_PATA40 : ATA_CBL_PATA80;
+}
+
 /**
  *      init_hwif_it8213        -       set up hwif structs
  *      @hwif: interface to set up
@@ -152,19 +159,10 @@ static void it8213_set_dma_mode(ide_drive_t *drive, const u8 speed)
 
 static void __devinit init_hwif_it8213(ide_hwif_t *hwif)
 {
-        struct pci_dev *dev = to_pci_dev(hwif->dev);
-        u8 reg42h = 0;
-
         hwif->set_dma_mode = &it8213_set_dma_mode;
         hwif->set_pio_mode = &it8213_set_pio_mode;
 
-        if (!hwif->dma_base)
-                return;
-
-        pci_read_config_byte(dev, 0x42, &reg42h);
-
-        if (hwif->cbl != ATA_CBL_PATA40_SHORT)
-                hwif->cbl = (reg42h & 0x02) ? ATA_CBL_PATA40 : ATA_CBL_PATA80;
+        hwif->cable_detect = it8213_cable_detect;
 }
 
 
diff --git a/drivers/ide/pci/it821x.c b/drivers/ide/pci/it821x.c
index 938d35f35c81..1597f0cc1bf1 100644
--- a/drivers/ide/pci/it821x.c
+++ b/drivers/ide/pci/it821x.c
@@ -63,13 +63,10 @@
 #include <linux/types.h>
 #include <linux/module.h>
 #include <linux/pci.h>
-#include <linux/delay.h>
 #include <linux/hdreg.h>
 #include <linux/ide.h>
 #include <linux/init.h>
 
-#include <asm/io.h>
-
 struct it821x_dev
 {
         unsigned int smart:1,           /* Are we in smart raid mode */
@@ -579,14 +576,13 @@ static void __devinit init_hwif_it821x(ide_hwif_t *hwif)
         } else
                 hwif->host_flags |= IDE_HFLAG_NO_SET_MODE;
 
+        hwif->cable_detect = ata66_it821x;
+
         if (hwif->dma_base == 0)
                 return;
 
         hwif->ultra_mask = ATA_UDMA6;
         hwif->mwdma_mask = ATA_MWDMA2;
-
-        if (hwif->cbl != ATA_CBL_PATA40_SHORT)
-                hwif->cbl = ata66_it821x(hwif);
 }
 
 static void __devinit it8212_disable_raid(struct pci_dev *dev)
diff --git a/drivers/ide/pci/jmicron.c b/drivers/ide/pci/jmicron.c
index 8b40f6479c55..a56bcb4f22f4 100644
--- a/drivers/ide/pci/jmicron.c
+++ b/drivers/ide/pci/jmicron.c
@@ -8,13 +8,10 @@
 #include <linux/types.h>
 #include <linux/module.h>
 #include <linux/pci.h>
-#include <linux/delay.h>
 #include <linux/hdreg.h>
 #include <linux/ide.h>
 #include <linux/init.h>
 
-#include <asm/io.h>
-
 typedef enum {
         PORT_PATA0 = 0,
         PORT_PATA1 = 1,
@@ -111,11 +108,7 @@ static void __devinit init_hwif_jmicron(ide_hwif_t *hwif)
         hwif->set_pio_mode = &jmicron_set_pio_mode;
         hwif->set_dma_mode = &jmicron_set_dma_mode;
 
-        if (hwif->dma_base == 0)
-                return;
-
-        if (hwif->cbl != ATA_CBL_PATA40_SHORT)
-                hwif->cbl = ata66_jmicron(hwif);
+        hwif->cable_detect = ata66_jmicron;
 }
 
 static const struct ide_port_info jmicron_chipset __devinitdata = {
diff --git a/drivers/ide/pci/ns87415.c b/drivers/ide/pci/ns87415.c
index fc9eee9ccac3..bf0d3b2931f1 100644
--- a/drivers/ide/pci/ns87415.c
+++ b/drivers/ide/pci/ns87415.c
@@ -10,11 +10,7 @@
 #include <linux/module.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
-#include <linux/timer.h>
-#include <linux/mm.h>
-#include <linux/ioport.h>
 #include <linux/interrupt.h>
-#include <linux/blkdev.h>
 #include <linux/hdreg.h>
 #include <linux/pci.h>
 #include <linux/delay.h>
diff --git a/drivers/ide/pci/opti621.c b/drivers/ide/pci/opti621.c
index 0ce92d323036..46e8748f507e 100644
--- a/drivers/ide/pci/opti621.c
+++ b/drivers/ide/pci/opti621.c
@@ -87,11 +87,6 @@
 #include <linux/types.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
-#include <linux/delay.h>
-#include <linux/timer.h>
-#include <linux/mm.h>
-#include <linux/ioport.h>
-#include <linux/blkdev.h>
 #include <linux/pci.h>
 #include <linux/hdreg.h>
 #include <linux/ide.h>
@@ -320,14 +315,18 @@ static void opti621_set_pio_mode(ide_drive_t *drive, const u8 pio)
         spin_unlock_irqrestore(&opti621_lock, flags);
 }
 
+static void __devinit opti621_port_init_devs(ide_hwif_t *hwif)
+{
+        hwif->drives[0].drive_data = PIO_DONT_KNOW;
+        hwif->drives[1].drive_data = PIO_DONT_KNOW;
+}
+
 /*
  * init_hwif_opti621() is called once for each hwif found at boot.
  */
 static void __devinit init_hwif_opti621 (ide_hwif_t *hwif)
 {
-        hwif->drives[0].drive_data = PIO_DONT_KNOW;
-        hwif->drives[1].drive_data = PIO_DONT_KNOW;
-
+        hwif->port_init_devs = opti621_port_init_devs;
         hwif->set_pio_mode = &opti621_set_pio_mode;
 }
 
diff --git a/drivers/ide/pci/pdc202xx_new.c b/drivers/ide/pci/pdc202xx_new.c
index bb29db03540e..1c8cb7797a4a 100644
--- a/drivers/ide/pci/pdc202xx_new.c
+++ b/drivers/ide/pci/pdc202xx_new.c
@@ -19,18 +19,12 @@
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/delay.h>
-#include <linux/timer.h>
-#include <linux/mm.h>
-#include <linux/ioport.h>
-#include <linux/blkdev.h>
 #include <linux/hdreg.h>
-#include <linux/interrupt.h>
 #include <linux/pci.h>
 #include <linux/init.h>
 #include <linux/ide.h>
 
 #include <asm/io.h>
-#include <asm/irq.h>
 
 #ifdef CONFIG_PPC_PMAC
 #include <asm/prom.h>
@@ -197,7 +191,7 @@ static void pdcnew_set_pio_mode(ide_drive_t *drive, const u8 pio)
         }
 }
 
-static u8 pdcnew_cable_detect(ide_hwif_t *hwif)
+static u8 __devinit pdcnew_cable_detect(ide_hwif_t *hwif)
 {
         if (get_indexed_reg(hwif, 0x0b) & 0x04)
                 return ATA_CBL_PATA40;
@@ -456,11 +450,7 @@ static void __devinit init_hwif_pdc202new(ide_hwif_t *hwif)
         hwif->quirkproc = &pdcnew_quirkproc;
         hwif->resetproc = &pdcnew_reset;
 
-        if (hwif->dma_base == 0)
-                return;
-
-        if (hwif->cbl != ATA_CBL_PATA40_SHORT)
-                hwif->cbl = pdcnew_cable_detect(hwif);
+        hwif->cable_detect = pdcnew_cable_detect;
 }
 
 static struct pci_dev * __devinit pdc20270_get_dev2(struct pci_dev *dev)
diff --git a/drivers/ide/pci/pdc202xx_old.c b/drivers/ide/pci/pdc202xx_old.c
index 31a1308414a0..da4329790387 100644
--- a/drivers/ide/pci/pdc202xx_old.c
+++ b/drivers/ide/pci/pdc202xx_old.c
@@ -32,18 +32,13 @@
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/delay.h>
-#include <linux/timer.h>
-#include <linux/mm.h>
-#include <linux/ioport.h>
 #include <linux/blkdev.h>
 #include <linux/hdreg.h>
-#include <linux/interrupt.h>
 #include <linux/pci.h>
 #include <linux/init.h>
 #include <linux/ide.h>
 
 #include <asm/io.h>
-#include <asm/irq.h>
 
 #define PDC202XX_DEBUG_DRIVE_INFO       0
 
@@ -140,10 +135,10 @@ static void pdc202xx_set_pio_mode(ide_drive_t *drive, const u8 pio)
         pdc202xx_set_mode(drive, XFER_PIO_0 + pio);
 }
 
-static u8 pdc202xx_old_cable_detect (ide_hwif_t *hwif)
+static u8 __devinit pdc2026x_old_cable_detect(ide_hwif_t *hwif)
 {
         struct pci_dev *dev = to_pci_dev(hwif->dev);
-        u16 CIS = 0, mask = (hwif->channel) ? (1<<11) : (1<<10);
+        u16 CIS, mask = hwif->channel ? (1 << 11) : (1 << 10);
 
         pci_read_config_word(dev, 0x50, &CIS);
 
@@ -311,9 +306,12 @@ static void __devinit init_hwif_pdc202xx(ide_hwif_t *hwif)
 
         hwif->quirkproc = &pdc202xx_quirkproc;
 
-        if (dev->device != PCI_DEVICE_ID_PROMISE_20246)
+        if (dev->device != PCI_DEVICE_ID_PROMISE_20246) {
                 hwif->resetproc = &pdc202xx_reset;
 
+                hwif->cable_detect = pdc2026x_old_cable_detect;
+        }
+
         if (hwif->dma_base == 0)
                 return;
 
@@ -321,9 +319,6 @@ static void __devinit init_hwif_pdc202xx(ide_hwif_t *hwif)
         hwif->dma_timeout = &pdc202xx_dma_timeout;
 
         if (dev->device != PCI_DEVICE_ID_PROMISE_20246) {
-                if (hwif->cbl != ATA_CBL_PATA40_SHORT)
-                        hwif->cbl = pdc202xx_old_cable_detect(hwif);
-
                 hwif->dma_start = &pdc202xx_old_ide_dma_start;
                 hwif->ide_dma_end = &pdc202xx_old_ide_dma_end;
         } 
diff --git a/drivers/ide/pci/piix.c b/drivers/ide/pci/piix.c
index c1a6b68337d5..decef0f47674 100644
--- a/drivers/ide/pci/piix.c
+++ b/drivers/ide/pci/piix.c
@@ -47,11 +47,9 @@
 #include <linux/types.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
-#include <linux/ioport.h>
 #include <linux/pci.h>
 #include <linux/hdreg.h>
 #include <linux/ide.h>
-#include <linux/delay.h>
 #include <linux/init.h>
 
 #include <asm/io.h>
@@ -290,14 +288,11 @@ static void __devinit init_hwif_piix(ide_hwif_t *hwif)
         hwif->set_pio_mode = &piix_set_pio_mode;
         hwif->set_dma_mode = &piix_set_dma_mode;
 
+        hwif->cable_detect = piix_cable_detect;
+
         if (!hwif->dma_base)
                 return;
 
-        if (hwif->ultra_mask & 0x78) {
-                if (hwif->cbl != ATA_CBL_PATA40_SHORT)
-                        hwif->cbl = piix_cable_detect(hwif);
-        }
-
         if (no_piix_dma)
                 hwif->ultra_mask = hwif->mwdma_mask = hwif->swdma_mask = 0;
 }
diff --git a/drivers/ide/pci/rz1000.c b/drivers/ide/pci/rz1000.c
index 7ed6625819d4..51676612f78f 100644
--- a/drivers/ide/pci/rz1000.c
+++ b/drivers/ide/pci/rz1000.c
@@ -16,18 +16,11 @@
 #include <linux/types.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
-#include <linux/delay.h>
-#include <linux/timer.h>
-#include <linux/mm.h>
-#include <linux/ioport.h>
-#include <linux/blkdev.h>
 #include <linux/hdreg.h>
 #include <linux/pci.h>
 #include <linux/ide.h>
 #include <linux/init.h>
 
-#include <asm/io.h>
-
 static void __devinit init_hwif_rz1000 (ide_hwif_t *hwif)
 {
         struct pci_dev *dev = to_pci_dev(hwif->dev);
@@ -40,8 +33,7 @@ static void __devinit init_hwif_rz1000 (ide_hwif_t *hwif)
         } else {
                 if (hwif->mate)
                         hwif->mate->serialized = hwif->serialized = 1;
-                hwif->drives[0].no_unmask = 1;
-                hwif->drives[1].no_unmask = 1;
+                hwif->host_flags |= IDE_HFLAG_NO_UNMASK_IRQS;
                 printk(KERN_INFO "%s: serialized, disabled unmasking "
                         "(buggy RZ1000/RZ1001)\n", hwif->name);
         }
diff --git a/drivers/ide/pci/sc1200.c b/drivers/ide/pci/sc1200.c
index af499a60eb31..561aa47c7720 100644
--- a/drivers/ide/pci/sc1200.c
+++ b/drivers/ide/pci/sc1200.c
@@ -14,19 +14,13 @@
 #include <linux/module.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
-#include <linux/delay.h>
-#include <linux/timer.h>
-#include <linux/mm.h>
-#include <linux/ioport.h>
-#include <linux/blkdev.h>
 #include <linux/hdreg.h>
-#include <linux/interrupt.h>
 #include <linux/pci.h>
 #include <linux/init.h>
 #include <linux/ide.h>
 #include <linux/pm.h>
+
 #include <asm/io.h>
-#include <asm/irq.h>
 
 #define SC1200_REV_A    0x00
 #define SC1200_REV_B1   0x01
diff --git a/drivers/ide/pci/scc_pata.c b/drivers/ide/pci/scc_pata.c
index 7694969b02ce..238e3e181e87 100644
--- a/drivers/ide/pci/scc_pata.c
+++ b/drivers/ide/pci/scc_pata.c
@@ -644,6 +644,11 @@ static void __devinit init_iops_scc(ide_hwif_t *hwif)
         init_mmio_iops_scc(hwif);
 }
 
+static u8 __devinit scc_cable_detect(ide_hwif_t *hwif)
+{
+        return ATA_CBL_PATA80;
+}
+
 /**
  *      init_hwif_scc   -       set up hwif
  *      @hwif: interface to set up
@@ -678,8 +683,7 @@ static void __devinit init_hwif_scc(ide_hwif_t *hwif)
         else
                 hwif->ultra_mask = ATA_UDMA5; /* 100MHz */
 
-        /* we support 80c cable only. */
-        hwif->cbl = ATA_CBL_PATA80;
+        hwif->cable_detect = scc_cable_detect;
 }
 
 #define DECLARE_SCC_DEV(name_str)                       \
@@ -732,7 +736,7 @@ static void __devexit scc_remove(struct pci_dev *dev)
                 hwif->dmatable_cpu = NULL;
         }
 
-        ide_unregister(hwif->index);
+        ide_unregister(hwif->index, 0, 0);
 
         hwif->chipset = ide_unknown;
         iounmap((void*)ports->dma);
diff --git a/drivers/ide/pci/serverworks.c b/drivers/ide/pci/serverworks.c
index f495253b7d41..c11880b0709f 100644
--- a/drivers/ide/pci/serverworks.c
+++ b/drivers/ide/pci/serverworks.c
@@ -31,12 +31,10 @@
 #include <linux/types.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
-#include <linux/ioport.h>
 #include <linux/pci.h>
 #include <linux/hdreg.h>
 #include <linux/ide.h>
 #include <linux/init.h>
-#include <linux/delay.h>
 
 #include <asm/io.h>
 
@@ -346,13 +344,8 @@ static void __devinit init_hwif_svwks (ide_hwif_t *hwif)
         hwif->set_dma_mode = &svwks_set_dma_mode;
         hwif->udma_filter = &svwks_udma_filter;
 
-        if (!hwif->dma_base)
-                return;
-
-        if (dev->device != PCI_DEVICE_ID_SERVERWORKS_OSB4IDE) {
-                if (hwif->cbl != ATA_CBL_PATA40_SHORT)
-                        hwif->cbl = ata66_svwks(hwif);
-        }
+        if (dev->device != PCI_DEVICE_ID_SERVERWORKS_OSB4IDE)
+                hwif->cable_detect = ata66_svwks;
 }
 
 #define IDE_HFLAGS_SVWKS \
diff --git a/drivers/ide/pci/sgiioc4.c b/drivers/ide/pci/sgiioc4.c
index 85902074b1fc..054626497be4 100644
--- a/drivers/ide/pci/sgiioc4.c
+++ b/drivers/ide/pci/sgiioc4.c
@@ -25,8 +25,6 @@
 #include <linux/hdreg.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
-#include <linux/timer.h>
-#include <linux/mm.h>
 #include <linux/ioport.h>
 #include <linux/blkdev.h>
 #include <linux/scatterlist.h>
@@ -555,7 +553,6 @@ static void __devinit
 ide_init_sgiioc4(ide_hwif_t * hwif)
 {
         hwif->mmio = 1;
-        hwif->pio_mask = 0x00;
         hwif->set_pio_mode = NULL; /* Sets timing for PIO mode */
         hwif->set_dma_mode = &sgiioc4_set_dma_mode;
         hwif->selectproc = NULL;/* Use the default routine to select drive */
@@ -572,8 +569,6 @@ ide_init_sgiioc4(ide_hwif_t * hwif)
         if (hwif->dma_base == 0)
                 return;
 
-        hwif->mwdma_mask = ATA_MWDMA2_ONLY;
-
         hwif->dma_host_set = &sgiioc4_dma_host_set;
         hwif->dma_setup = &sgiioc4_ide_dma_setup;
         hwif->dma_start = &sgiioc4_ide_dma_start;
@@ -583,6 +578,13 @@ ide_init_sgiioc4(ide_hwif_t * hwif)
         hwif->dma_timeout = &ide_dma_timeout;
 }
 
+static const struct ide_port_info sgiioc4_port_info __devinitdata = {
+        .chipset                = ide_pci,
+        .host_flags             = IDE_HFLAG_NO_DMA | /* no SFF-style DMA */
+                                  IDE_HFLAG_NO_AUTOTUNE,
+        .mwdma_mask             = ATA_MWDMA2_ONLY,
+};
+
 static int __devinit
 sgiioc4_ide_setup_pci_device(struct pci_dev *dev)
 {
@@ -593,6 +595,7 @@ sgiioc4_ide_setup_pci_device(struct pci_dev *dev)
         int h;
         u8 idx[4] = { 0xff, 0xff, 0xff, 0xff };
         hw_regs_t hw;
+        struct ide_port_info d = sgiioc4_port_info;
 
         /*
          * Find an empty HWIF; if none available, return -ENOMEM.
@@ -641,7 +644,6 @@ sgiioc4_ide_setup_pci_device(struct pci_dev *dev)
         ide_init_port_hw(hwif, &hw);
 
         hwif->dev = &dev->dev;
-        hwif->channel = 0;      /* Single Channel chip */
 
         /* The IOC4 uses MMIO rather than Port IO. */
         default_hwif_mmiops(hwif);
@@ -649,15 +651,17 @@ sgiioc4_ide_setup_pci_device(struct pci_dev *dev)
         /* Initializing chipset IRQ Registers */
         writel(0x03, (void __iomem *)(irqport + IOC4_INTR_SET * 4));
 
-        if (dma_base == 0 || ide_dma_sgiioc4(hwif, dma_base))
+        if (dma_base == 0 || ide_dma_sgiioc4(hwif, dma_base)) {
                 printk(KERN_INFO "%s: %s Bus-Master DMA disabled\n",
                                  hwif->name, DRV_NAME);
+                d.mwdma_mask = 0;
+        }
 
         ide_init_sgiioc4(hwif);
 
         idx[0] = hwif->index;
 
-        if (ide_device_add(idx))
+        if (ide_device_add(idx, &d))
                 return -EIO;
 
         return 0;
diff --git a/drivers/ide/pci/siimage.c b/drivers/ide/pci/siimage.c
index 4877bc8cd599..ef5b39fa042b 100644
--- a/drivers/ide/pci/siimage.c
+++ b/drivers/ide/pci/siimage.c
@@ -39,7 +39,6 @@
 #include <linux/types.h>
 #include <linux/module.h>
 #include <linux/pci.h>
-#include <linux/delay.h>
 #include <linux/hdreg.h>
 #include <linux/ide.h>
 #include <linux/init.h>
@@ -332,15 +331,18 @@ static int siimage_mmio_ide_dma_test_irq (ide_drive_t *drive)
 {
         ide_hwif_t *hwif        = HWIF(drive);
         unsigned long addr      = siimage_selreg(hwif, 0x1);
+        void __iomem *sata_error_addr
+                = (void __iomem *)hwif->sata_scr[SATA_ERROR_OFFSET];
 
-        if (SATA_ERROR_REG) {
+        if (sata_error_addr) {
                 unsigned long base = (unsigned long)hwif->hwif_data;
-
                 u32 ext_stat = readl((void __iomem *)(base + 0x10));
                 u8 watchdog = 0;
+
                 if (ext_stat & ((hwif->channel) ? 0x40 : 0x10)) {
-                        u32 sata_error = readl((void __iomem *)SATA_ERROR_REG);
-                        writel(sata_error, (void __iomem *)SATA_ERROR_REG);
+                        u32 sata_error = readl(sata_error_addr);
+
+                        writel(sata_error, sata_error_addr);
                         watchdog = (sata_error & 0x00680000) ? 1 : 0;
                         printk(KERN_WARNING "%s: sata_error = 0x%08x, "
                                 "watchdog = %d, %s\n",
@@ -419,13 +421,17 @@ static int sil_sata_busproc(ide_drive_t * drive, int state)
 
 static int sil_sata_reset_poll(ide_drive_t *drive)
 {
-        if (SATA_STATUS_REG) {
-                ide_hwif_t *hwif        = HWIF(drive);
+        ide_hwif_t *hwif = drive->hwif;
+        void __iomem *sata_status_addr
+                = (void __iomem *)hwif->sata_scr[SATA_STATUS_OFFSET];
 
-                /* SATA_STATUS_REG is valid only when in MMIO mode */
-                if ((readl((void __iomem *)SATA_STATUS_REG) & 0x03) != 0x03) {
+        if (sata_status_addr) {
+                /* SATA Status is available only when in MMIO mode */
+                u32 sata_stat = readl(sata_status_addr);
+
+                if ((sata_stat & 0x03) != 0x03) {
                         printk(KERN_WARNING "%s: reset phy dead, status=0x%08x\n",
-                                hwif->name, readl((void __iomem *)SATA_STATUS_REG));
+                                            hwif->name, sata_stat);
                         HWGROUP(drive)->polling = 0;
                         return ide_started;
                 }
@@ -827,15 +833,14 @@ static void __devinit init_hwif_siimage(ide_hwif_t *hwif)
         } else
                 hwif->udma_filter = &sil_pata_udma_filter;
 
+        hwif->cable_detect = ata66_siimage;
+
         if (hwif->dma_base == 0)
                 return;
 
         if (sata)
                 hwif->host_flags |= IDE_HFLAG_NO_ATAPI_DMA;
 
-        if (hwif->cbl != ATA_CBL_PATA40_SHORT)
-                hwif->cbl = ata66_siimage(hwif);
-
         if (hwif->mmio) {
                 hwif->ide_dma_test_irq = &siimage_mmio_ide_dma_test_irq;
         } else {
diff --git a/drivers/ide/pci/sis5513.c b/drivers/ide/pci/sis5513.c
index 2a461de22aa0..512bb4c1fd5c 100644
--- a/drivers/ide/pci/sis5513.c
+++ b/drivers/ide/pci/sis5513.c
@@ -47,20 +47,11 @@
 #include <linux/types.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
-#include <linux/delay.h>
-#include <linux/timer.h>
-#include <linux/mm.h>
-#include <linux/ioport.h>
-#include <linux/blkdev.h>
 #include <linux/hdreg.h>
-
-#include <linux/interrupt.h>
 #include <linux/pci.h>
 #include <linux/init.h>
 #include <linux/ide.h>
 
-#include <asm/irq.h>
-
 #include "ide-timing.h"
 
 /* registers layout and init values are chipset family dependant */
@@ -565,13 +556,12 @@ static void __devinit init_hwif_sis5513 (ide_hwif_t *hwif)
         if (chipset_family >= ATA_133)
                 hwif->udma_filter = sis5513_ata133_udma_filter;
 
+        hwif->cable_detect = ata66_sis5513;
+
         if (hwif->dma_base == 0)
                 return;
 
         hwif->ultra_mask = udma_rates[chipset_family];
-
-        if (hwif->cbl != ATA_CBL_PATA40_SHORT)
-                hwif->cbl = ata66_sis5513(hwif);
 }
 
 static const struct ide_port_info sis5513_chipset __devinitdata = {
diff --git a/drivers/ide/pci/sl82c105.c b/drivers/ide/pci/sl82c105.c
index da13a1298ada..ee261ae15b6f 100644
--- a/drivers/ide/pci/sl82c105.c
+++ b/drivers/ide/pci/sl82c105.c
@@ -17,17 +17,11 @@
 #include <linux/types.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
-#include <linux/timer.h>
-#include <linux/mm.h>
-#include <linux/ioport.h>
-#include <linux/interrupt.h>
-#include <linux/blkdev.h>
 #include <linux/hdreg.h>
 #include <linux/pci.h>
 #include <linux/ide.h>
 
 #include <asm/io.h>
-#include <asm/dma.h>
 
 #undef DEBUG
 
diff --git a/drivers/ide/pci/slc90e66.c b/drivers/ide/pci/slc90e66.c
index a6cf810c4699..65f4c2ffaa59 100644
--- a/drivers/ide/pci/slc90e66.c
+++ b/drivers/ide/pci/slc90e66.c
@@ -10,15 +10,11 @@
 #include <linux/types.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
-#include <linux/ioport.h>
 #include <linux/pci.h>
 #include <linux/hdreg.h>
 #include <linux/ide.h>
-#include <linux/delay.h>
 #include <linux/init.h>
 
-#include <asm/io.h>
-
 static DEFINE_SPINLOCK(slc90e66_lock);
 
 static void slc90e66_set_pio_mode(ide_drive_t *drive, const u8 pio)
@@ -118,23 +114,23 @@ static void slc90e66_set_dma_mode(ide_drive_t *drive, const u8 speed)
         }
 }
 
-static void __devinit init_hwif_slc90e66 (ide_hwif_t *hwif)
+static u8 __devinit slc90e66_cable_detect(ide_hwif_t *hwif)
 {
         struct pci_dev *dev = to_pci_dev(hwif->dev);
-        u8 reg47 = 0;
-        u8 mask = hwif->channel ? 0x01 : 0x02;  /* bit0:Primary */
-
-        hwif->set_pio_mode = &slc90e66_set_pio_mode;
-        hwif->set_dma_mode = &slc90e66_set_dma_mode;
+        u8 reg47 = 0, mask = hwif->channel ? 0x01 : 0x02;
 
         pci_read_config_byte(dev, 0x47, &reg47);
 
-        if (hwif->dma_base == 0)
-                return;
+        /* bit[0(1)]: 0:80, 1:40 */
+        return (reg47 & mask) ? ATA_CBL_PATA40 : ATA_CBL_PATA80;
+}
+
+static void __devinit init_hwif_slc90e66(ide_hwif_t *hwif)
+{
+        hwif->set_pio_mode = &slc90e66_set_pio_mode;
+        hwif->set_dma_mode = &slc90e66_set_dma_mode;
 
-        if (hwif->cbl != ATA_CBL_PATA40_SHORT)
-                /* bit[0(1)]: 0:80, 1:40 */
-                hwif->cbl = (reg47 & mask) ? ATA_CBL_PATA40 : ATA_CBL_PATA80;
+        hwif->cable_detect = slc90e66_cable_detect;
 }
 
 static const struct ide_port_info slc90e66_chipset __devinitdata = {
diff --git a/drivers/ide/pci/tc86c001.c b/drivers/ide/pci/tc86c001.c
index 9fbbb4f2dd54..2ef2ed2f2b32 100644
--- a/drivers/ide/pci/tc86c001.c
+++ b/drivers/ide/pci/tc86c001.c
@@ -160,6 +160,19 @@ static int tc86c001_busproc(ide_drive_t *drive, int state)
         return 0;
 }
 
+static u8 __devinit tc86c001_cable_detect(ide_hwif_t *hwif)
+{
+        struct pci_dev *dev = to_pci_dev(hwif->dev);
+        unsigned long sc_base = pci_resource_start(dev, 5);
+        u16 scr1 = inw(sc_base + 0x00);
+
+        /*
+         * System Control  1 Register bit 13 (PDIAGN):
+         * 0=80-pin cable, 1=40-pin cable
+         */
+        return (scr1 & 0x2000) ? ATA_CBL_PATA40 : ATA_CBL_PATA80;
+}
+
 static void __devinit init_hwif_tc86c001(ide_hwif_t *hwif)
 {
         struct pci_dev *dev     = to_pci_dev(hwif->dev);
@@ -183,6 +196,8 @@ static void __devinit init_hwif_tc86c001(ide_hwif_t *hwif)
 
         hwif->busproc   = &tc86c001_busproc;
 
+        hwif->cable_detect = tc86c001_cable_detect;
+
         if (!hwif->dma_base)
                 return;
 
@@ -196,15 +211,6 @@ static void __devinit init_hwif_tc86c001(ide_hwif_t *hwif)
         hwif->rqsize     = 0xffff;
 
         hwif->dma_start         = &tc86c001_dma_start;
-
-        if (hwif->cbl != ATA_CBL_PATA40_SHORT) {
-                /*
-                 * System Control  1 Register bit 13 (PDIAGN):
-                 * 0=80-pin cable, 1=40-pin cable
-                 */
-                scr1 = inw(sc_base + 0x00);
-                hwif->cbl = (scr1 & 0x2000) ? ATA_CBL_PATA40 : ATA_CBL_PATA80;
-        }
 }
 
 static unsigned int __devinit init_chipset_tc86c001(struct pci_dev *dev,
diff --git a/drivers/ide/pci/triflex.c b/drivers/ide/pci/triflex.c
index 852b72693736..a67d02a3f96e 100644
--- a/drivers/ide/pci/triflex.c
+++ b/drivers/ide/pci/triflex.c
@@ -28,11 +28,6 @@
 #include <linux/types.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
-#include <linux/delay.h>
-#include <linux/timer.h>
-#include <linux/mm.h>
-#include <linux/ioport.h>
-#include <linux/blkdev.h>
 #include <linux/hdreg.h>
 #include <linux/pci.h>
 #include <linux/ide.h>
diff --git a/drivers/ide/pci/trm290.c b/drivers/ide/pci/trm290.c
index d9ebb698953a..de750f7a43e9 100644
--- a/drivers/ide/pci/trm290.c
+++ b/drivers/ide/pci/trm290.c
@@ -131,14 +131,12 @@
 #include <linux/types.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
-#include <linux/mm.h>
 #include <linux/ioport.h>
 #include <linux/interrupt.h>
 #include <linux/blkdev.h>
 #include <linux/init.h>
 #include <linux/hdreg.h>
 #include <linux/pci.h>
-#include <linux/delay.h>
 #include <linux/ide.h>
 
 #include <asm/io.h>
@@ -179,10 +177,7 @@ static void trm290_selectproc (ide_drive_t *drive)
 
 static void trm290_dma_exec_cmd(ide_drive_t *drive, u8 command)
 {
-        BUG_ON(HWGROUP(drive)->handler != NULL);        /* paranoia check */
-        ide_set_handler(drive, &ide_dma_intr, WAIT_CMD, NULL);
-        /* issue cmd to drive */
-        outb(command, IDE_COMMAND_REG);
+        ide_execute_command(drive, command, &ide_dma_intr, WAIT_CMD, NULL);
 }
 
 static int trm290_dma_setup(ide_drive_t *drive)
diff --git a/drivers/ide/pci/via82cxxx.c b/drivers/ide/pci/via82cxxx.c
index 24cb9047fb41..f3f79f805813 100644
--- a/drivers/ide/pci/via82cxxx.c
+++ b/drivers/ide/pci/via82cxxx.c
@@ -26,15 +26,11 @@
 
 #include <linux/module.h>
 #include <linux/kernel.h>
-#include <linux/ioport.h>
-#include <linux/blkdev.h>
 #include <linux/pci.h>
 #include <linux/init.h>
 #include <linux/ide.h>
 #include <linux/dmi.h>
 
-#include <asm/io.h>
-
 #ifdef CONFIG_PPC_CHRP
 #include <asm/processor.h>
 #endif
@@ -424,11 +420,7 @@ static void __devinit init_hwif_via82cxxx(ide_hwif_t *hwif)
         hwif->set_pio_mode = &via_set_pio_mode;
         hwif->set_dma_mode = &via_set_drive;
 
-        if (!hwif->dma_base)
-                return;
-
-        if (hwif->cbl != ATA_CBL_PATA40_SHORT)
-                hwif->cbl = via82cxxx_cable_detect(hwif);
+        hwif->cable_detect = via82cxxx_cable_detect;
 }
 
 static const struct ide_port_info via82cxxx_chipset __devinitdata = {