From patchwork Mon Feb 10 13:00:10 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Nowicki X-Patchwork-Id: 3618541 Return-Path: X-Original-To: patchwork-linux-acpi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 94A829F2D6 for ; Mon, 10 Feb 2014 13:00:40 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id AF802201D3 for ; Mon, 10 Feb 2014 13:00:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D09EF20179 for ; Mon, 10 Feb 2014 13:00:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752303AbaBJNAh (ORCPT ); Mon, 10 Feb 2014 08:00:37 -0500 Received: from mail-ea0-f174.google.com ([209.85.215.174]:35844 "EHLO mail-ea0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752206AbaBJNAg (ORCPT ); Mon, 10 Feb 2014 08:00:36 -0500 Received: by mail-ea0-f174.google.com with SMTP id b10so2971548eae.19 for ; Mon, 10 Feb 2014 05:00:35 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=xl+PnKp37TO8/s41ZdkiahYj2ia6AdG8WJ/lldZAe6A=; b=LqmA6dcp4A/Kz3V6UL6vs6QGomctou1id305x/EdRlWLu0ofSZ4vAWqBPm1f4bqQos w/IT/Yy0xpR6cjfhEVxoseBvEWGuZ5CaEQOZZi0R5s6zpNI6MRSW7a0Tw+7GNKW5Ua9P EQooaKl0m5ZHI8KygH5+x/tceAil10x4ZXNEwctPQPWxGmS2MDQhUA+g3MiGIPOkN1Ku csyuo+oVZfkkAcy95k386MCJOAXvZiPsrMg+emYwyFT/PLK7fRlIVzl9e1StjFa868jN uPqNqbKgLWfq4W7kYC/pV22ADb/EjlF3J/07Qg8tUlYrtYQg//lFqCDSaef4FNlKQj3s fxdA== X-Gm-Message-State: ALoCoQlE6bn+8fw4Pj9mtbvx30FQWtOcLAQ2ovUJ2HkimrVBlLMuzIsqmE7jw87TSzgddIVK9pBZ X-Received: by 10.14.94.3 with SMTP id m3mr3538766eef.54.1392037235824; Mon, 10 Feb 2014 05:00:35 -0800 (PST) Received: from tn-HP3-PC.semihalf.com ([80.82.22.190]) by mx.google.com with ESMTPSA id u6sm54278039eep.11.2014.02.10.05.00.31 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 10 Feb 2014 05:00:34 -0800 (PST) From: Tomasz Nowicki To: lenb@kernel.org, rjw@rjwysocki.net Cc: linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, Tomasz Nowicki Subject: [PATCH 1/2] ACPI, PCI, ISA: Call ISA-specific code only for architectures which support ISA. Date: Mon, 10 Feb 2014 14:00:10 +0100 Message-Id: <1392037211-29349-1-git-send-email-tomasz.nowicki@linaro.org> X-Mailer: git-send-email 1.7.9.5 Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This commit enables ISA-specific code if and only if CONFIG_{E}ISA is set in the kernel configuration so that we do not have to maintain acpi_isa_irq_to_gsi() function for architectures which do not support ISA. Signed-off-by: Tomasz Nowicki --- drivers/acpi/pci_irq.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/acpi/pci_irq.c b/drivers/acpi/pci_irq.c index 41c5e1b..b0e31b6 100644 --- a/drivers/acpi/pci_irq.c +++ b/drivers/acpi/pci_irq.c @@ -418,6 +418,7 @@ int acpi_pci_irq_enable(struct pci_dev *dev) * driver reported one, then use it. Exit in any case. */ if (gsi < 0) { +#if IS_ENABLED(CONFIG_ISA) || IS_ENABLED(CONFIG_EISA) u32 dev_gsi; /* Interrupt Line values above 0xF are forbidden */ if (dev->irq > 0 && (dev->irq <= 0xF) && @@ -427,10 +428,9 @@ int acpi_pci_irq_enable(struct pci_dev *dev) acpi_register_gsi(&dev->dev, dev_gsi, ACPI_LEVEL_SENSITIVE, ACPI_ACTIVE_LOW); - } else { - dev_warn(&dev->dev, "PCI INT %c: no GSI\n", - pin_name(pin)); - } + } else +#endif + dev_warn(&dev->dev, "PCI INT %c: no GSI\n", pin_name(pin)); return 0; }