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: 24405 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ig0-f199.google.com (mail-ig0-f199.google.com [209.85.213.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 3861820143 for ; Mon, 10 Feb 2014 13:00:42 +0000 (UTC) Received: by mail-ig0-f199.google.com with SMTP id c10sf15101748igq.2 for ; Mon, 10 Feb 2014 05:00:41 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:sender:precedence:list-id:x-original-sender :x-original-authentication-results:mailing-list:list-post:list-help :list-archive:list-unsubscribe; bh=aojF0nFSaehZ3o6/upIGQTstKwigiQu2MtJImtgu+xw=; b=bxcbjpxAv3GEO5MfuL80QaRLiZn/LYRQ8w/FEkVOnlmUqCm3Gprr4J8PV5zIni2o8P +JzcnUIxyPWH74QVYFplFDTGM0pH8FUMAXc4L79EYzpc0qbB/VQnVhdAQco9WSXsJBKa K43yllYUwZsWwczlB1l15ye2rVT+UyJXEnzWynKHJuOzTfOUzGyViUYecJGzzKc2JFbo 00a58sDl/VpjhyT+ofL2oMRFMNGf2GvyPa1Q8wZMyypLIaAfc033yafpy0tDZrWgrtj4 QatBMTLX3Zs1hGpwv9pjSzjzggeo8gVeLVU83vBsJ2v+HG/2iCxiS80Glz0+Pz04REPd ipDg== X-Gm-Message-State: ALoCoQmgnxJwsXZHf7Lhtn3zVszfuCu+sXMIs3RsIe9VIazuyYFUM8vhbGgZhz8IrJh+1fmyrb65 X-Received: by 10.50.112.10 with SMTP id im10mr6265210igb.1.1392037241318; Mon, 10 Feb 2014 05:00:41 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.85.133 with SMTP id n5ls2029064qgd.64.gmail; Mon, 10 Feb 2014 05:00:41 -0800 (PST) X-Received: by 10.52.109.193 with SMTP id hu1mr20273550vdb.11.1392037241203; Mon, 10 Feb 2014 05:00:41 -0800 (PST) Received: from mail-ve0-f181.google.com (mail-ve0-f181.google.com [209.85.128.181]) by mx.google.com with ESMTPS id yj2si4755874veb.85.2014.02.10.05.00.40 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 10 Feb 2014 05:00:40 -0800 (PST) Received-SPF: neutral (google.com: 209.85.128.181 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.181; Received: by mail-ve0-f181.google.com with SMTP id cz12so4816623veb.40 for ; Mon, 10 Feb 2014 05:00:40 -0800 (PST) X-Received: by 10.52.248.138 with SMTP id ym10mr20166147vdc.18.1392037240616; Mon, 10 Feb 2014 05:00:40 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.174.196 with SMTP id u4csp166006vcz; Mon, 10 Feb 2014 05:00:40 -0800 (PST) X-Received: by 10.68.34.37 with SMTP id w5mr3506404pbi.159.1392037239663; Mon, 10 Feb 2014 05:00:39 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id x3si15378057pbk.83.2014.02.10.05.00.38; Mon, 10 Feb 2014 05:00:38 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-acpi-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752303AbaBJNAh (ORCPT + 8 others); 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-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: list List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: tomasz.nowicki@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.181 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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; }