Revert "UBUNTU: SAUCE: ata: make DVD drive recognisable on systems with Sandybridge CPT chipset"

This reverts commit 44e8c44804843af82e614921173bc0e01c3ea2e0.

There is a better solution which fixes more cases.

BugLink: https://bugs.launchpad.net/bugs/737388
BugLink: https://bugs.launchpad.net/bugs/794642
BugLink: https://bugs.launchpad.net/bugs/782389

Upstream: [1],[2],[3]

[1], https://bugzilla.kernel.org/show_bug.cgi?id=40592
[2], http://marc.info/?t=131665670300001&r=1&w=2
[3], http://marc.info/?t=131743346400002&r=1&w=2

Signed-off-by: Ming Lei <ming.lei@canonical.com>
Acked-by: Tim Gardner <tim.gardner@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>

1 files changed, 1 insertions, 11 deletions

diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c
index bfaa44ecfca..6f6e7718b05 100644
--- a/drivers/ata/ata_piix.c
+++ b/drivers/ata/ata_piix.c
@@ -341,12 +341,11 @@ static struct ata_port_operations piix_sata_ops = {
 };
 
 static struct ata_port_operations piix_pata_ops = {
-        .inherits               = &ata_bmdma32_port_ops,
+        .inherits               = &piix_sata_ops,
         .cable_detect           = ata_cable_40wire,
         .set_piomode            = piix_set_piomode,
         .set_dmamode            = piix_set_dmamode,
         .prereset               = piix_pata_prereset,
-        .sff_irq_check          = piix_irq_check,
 };
 
 static struct ata_port_operations piix_vmw_ops = {
@@ -1588,15 +1587,6 @@ static int __devinit piix_init_one(struct pci_dev *pdev,
                                 "on poweroff and hibernation\n");
         }
 
-        /*
-         * Sandybridge chipset H61/P67/H67 have broken 32 mode up to now
-         * see https://bugzilla.kernel.org/show_bug.cgi?id=40592
-         */
-        if (pdev->vendor == PCI_VENDOR_ID_INTEL && pdev->device == 0x1c00)
-                piix_sata_ops.inherits = &ata_bmdma_port_ops;
-        else
-                piix_sata_ops.inherits = &ata_bmdma32_port_ops;
-
         port_info[0] = piix_port_info[ent->driver_data];
         port_info[1] = piix_port_info[ent->driver_data];