From patchwork Mon Oct 10 01:45:50 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Lei X-Patchwork-Id: 118629 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 5BFE5B6FAF for ; Mon, 10 Oct 2011 12:46:25 +1100 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1RD4wP-0003Iz-U6; Mon, 10 Oct 2011 01:46:05 +0000 Received: from mail-yx0-f177.google.com ([209.85.213.177]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1RD4wN-0003It-3E for kernel-team@lists.ubuntu.com; Mon, 10 Oct 2011 01:46:03 +0000 Received: by yxi11 with SMTP id 11so5597674yxi.8 for ; Sun, 09 Oct 2011 18:46:02 -0700 (PDT) Received: by 10.68.22.195 with SMTP id g3mr33032104pbf.108.1318211162078; Sun, 09 Oct 2011 18:46:02 -0700 (PDT) Received: from localhost ([183.37.205.209]) by mx.google.com with ESMTPS id z1sm62007614pbl.5.2011.10.09.18.45.57 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 09 Oct 2011 18:46:00 -0700 (PDT) From: ming.lei@canonical.com To: kernel-team@lists.ubuntu.com Subject: [Oneiric][PATCH]UBUNTU: SAUCE: revert "ata: make DVD drive recognisable on systems with Sandybridge CPT chipset" Date: Mon, 10 Oct 2011 09:45:50 +0800 Message-Id: <1318211150-31679-1-git-send-email-ming.lei@canonical.com> X-Mailer: git-send-email 1.7.5.4 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.13 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com From: Ming Lei Revert the commit 44e8c44804843af82e614921173bc0e01c3ea2e0 in ubuntu-oneiric.git. UBUNTU: SAUCE: ata: make DVD drive recognisable on systems with Sandybridge CPT chipset because we have a better solution which can fix more cases than the old one. BugLink: https://bugs.launchpad.net/bugs/737388 https://bugs.launchpad.net/bugs/794642 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 --- drivers/ata/ata_piix.c | 12 +----------- 1 files changed, 1 insertions(+), 11 deletions(-) diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c index eb7ea56..43107e9 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 = { @@ -1586,15 +1585,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];