From patchwork Tue Feb 17 20:49:10 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 7670 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n1HKnFJv025205 for ; Tue, 17 Feb 2009 20:49:15 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751024AbZBQUtO (ORCPT ); Tue, 17 Feb 2009 15:49:14 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751095AbZBQUtO (ORCPT ); Tue, 17 Feb 2009 15:49:14 -0500 Received: from g1t0028.austin.hp.com ([15.216.28.35]:28016 "EHLO g1t0028.austin.hp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751024AbZBQUtN (ORCPT ); Tue, 17 Feb 2009 15:49:13 -0500 Received: from smtp2.fc.hp.com (smtp.fc.hp.com [15.11.136.114]) by g1t0028.austin.hp.com (Postfix) with ESMTP id 971C61C104; Tue, 17 Feb 2009 20:49:13 +0000 (UTC) Received: from localhost.localdomain (lart.fc.hp.com [15.11.146.31]) by smtp2.fc.hp.com (Postfix) with ESMTP id 0D1292B9C50; Tue, 17 Feb 2009 20:27:51 +0000 (UTC) Received: from bob.kio (localhost [127.0.0.1]) by localhost.localdomain (Postfix) with ESMTP id 16C2026146; Tue, 17 Feb 2009 13:49:11 -0700 (MST) From: Bjorn Helgaas Subject: [PATCH] ACPI: PCI: use generic pci_swizzle_interrupt_pin() To: Len Brown Cc: linux-acpi@vger.kernel.org Date: Tue, 17 Feb 2009 13:49:10 -0700 Message-ID: <20090217204910.4213.77580.stgit@bob.kio> User-Agent: StGIT/0.14.3.215.gff3d MIME-Version: 1.0 Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org Use the generic pci_swizzle_interrupt_pin() instead of ACPI-specific code. Signed-off-by: Bjorn Helgaas --- drivers/acpi/pci_irq.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/acpi/pci_irq.c b/drivers/acpi/pci_irq.c index 891bdf6..be6b909 100644 --- a/drivers/acpi/pci_irq.c +++ b/drivers/acpi/pci_irq.c @@ -319,7 +319,7 @@ static struct acpi_prt_entry *acpi_pci_irq_lookup(struct pci_dev *dev, int pin) */ bridge = dev->bus->self; while (bridge) { - pin = (((pin - 1) + PCI_SLOT(dev->devfn)) % 4) + 1; + pin = pci_swizzle_interrupt_pin(dev, pin); if ((bridge->class >> 8) == PCI_CLASS_BRIDGE_CARDBUS) { /* PC card has the same IRQ as its cardbridge */