From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753498AbbIQF7v (ORCPT ); Thu, 17 Sep 2015 01:59:51 -0400 Received: from mga02.intel.com ([134.134.136.20]:11986 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753175AbbIQF7t (ORCPT ); Thu, 17 Sep 2015 01:59:49 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.17,544,1437462000"; d="scan'208";a="646519693" From: Jiang Liu To: "Rafael J . Wysocki" , Bjorn Helgaas , Thomas Gleixner , "Rafael J. Wysocki" , Len Brown Cc: Jiang Liu , wfg@linux.intel.com, linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, linux-acpi@vger.kernel.org, x86@kernel.org Subject: [Bugfix 2/2] ACPI / PCI: Remove duplicated penalty on SCI IRQ Date: Thu, 17 Sep 2015 14:02:46 +0800 Message-Id: <1442469766-31264-2-git-send-email-jiang.liu@linux.intel.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1442469766-31264-1-git-send-email-jiang.liu@linux.intel.com> References: <1442469766-31264-1-git-send-email-jiang.liu@linux.intel.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Now we have dedicated interface acpi_penalize_sci_irq() to penalize ISA IRQ used by ACPI SCI, so remove duplicated code to penalize ACPI SCI in acpi_irq_penalty_init(). Signed-off-by: Jiang Liu --- drivers/acpi/pci_link.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/acpi/pci_link.c b/drivers/acpi/pci_link.c index 246e50d22120..7c8408b946ca 100644 --- a/drivers/acpi/pci_link.c +++ b/drivers/acpi/pci_link.c @@ -498,8 +498,7 @@ int __init acpi_irq_penalty_init(void) PIRQ_PENALTY_PCI_POSSIBLE; } } - /* Add a penalty for the SCI */ - acpi_irq_penalty[acpi_gbl_FADT.sci_interrupt] += PIRQ_PENALTY_PCI_USING; + return 0; } -- 1.7.10.4