libata/IDE: remove combined mode quirk

Both old-IDE and libata should be able handle all controllers and
devices found using normal resource reservation methods.

This eliminates the awful, low-performing split-driver configuration
where old-IDE drove the PATA portion of a PCI device, in PIO-only mode,
and libata drove the SATA portion of the /same/ PCI device, in DMA mode.
Typically vendors would ship SATA hard drive / PATA optical
configuration, which would lend itself to slow (PIO-only) CD-ROM
performance.

For Intel users running in combined mode, it is now wholly dependent on
your driver choice (potentially link order, if you compile both drivers
in) whether old-IDE or libata will drive your hardware.

In either case, you will get full performance from both SATA and PATA
ports now, without having to pass a kernel command line parameter.

Signed-off-by: Jeff Garzik <jeff@garzik.org>

1 files changed, 6 insertions, 30 deletions

diff --git a/drivers/ata/libata-sff.c b/drivers/ata/libata-sff.c
index 066689c5e509..0a194660fd21 100644
--- a/drivers/ata/libata-sff.c
+++ b/drivers/ata/libata-sff.c
@@ -779,40 +779,16 @@ int ata_pci_init_one (struct pci_dev *pdev, struct ata_port_info **port_info,
                 /* Deal with combined mode hack. This side of the logic all
                    goes away once the combined mode hack is killed in 2.6.21 */
                 if (!devm_request_region(dev, ATA_PRIMARY_CMD, 8, "libata")) {
-                        struct resource *conflict, res;
-                        res.start = ATA_PRIMARY_CMD;
-                        res.end = ATA_PRIMARY_CMD + 8 - 1;
-                        conflict = ____request_resource(&ioport_resource, &res);
-                        while (conflict->child)
-                                conflict = ____request_resource(conflict, &res);
-                        if (!strcmp(conflict->name, "libata"))
-                                legacy_mode |= ATA_PORT_PRIMARY;
-                        else {
-                                pcim_pin_device(pdev);
-                                printk(KERN_WARNING "ata: 0x%0X IDE port busy\n" \
-                                                    "ata: conflict with %s\n",
-                                                    ATA_PRIMARY_CMD,
-                                                    conflict->name);
-                        }
+                        pcim_pin_device(pdev);
+                        printk(KERN_WARNING "ata: 0x%0X IDE port busy\n",
+                                            ATA_PRIMARY_CMD);
                 } else
                         legacy_mode |= ATA_PORT_PRIMARY;
 
                 if (!devm_request_region(dev, ATA_SECONDARY_CMD, 8, "libata")) {
-                        struct resource *conflict, res;
-                        res.start = ATA_SECONDARY_CMD;
-                        res.end = ATA_SECONDARY_CMD + 8 - 1;
-                        conflict = ____request_resource(&ioport_resource, &res);
-                        while (conflict->child)
-                                conflict = ____request_resource(conflict, &res);
-                        if (!strcmp(conflict->name, "libata"))
-                                legacy_mode |= ATA_PORT_SECONDARY;
-                        else {
-                                pcim_pin_device(pdev);
-                                printk(KERN_WARNING "ata: 0x%X IDE port busy\n" \
-                                                    "ata: conflict with %s\n",
-                                                    ATA_SECONDARY_CMD,
-                                                    conflict->name);
-                        }
+                        pcim_pin_device(pdev);
+                        printk(KERN_WARNING "ata: 0x%X IDE port busy\n",
+                                            ATA_SECONDARY_CMD);
                 } else
                         legacy_mode |= ATA_PORT_SECONDARY;