Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp2092866imu; Wed, 12 Dec 2018 09:21:17 -0800 (PST) X-Google-Smtp-Source: AFSGD/UIe0XoPEaTdzXrsSBXGPpuHrqMNvhSnhdMt92o7noYkwELh7wml6qOT3BOPwojXFPSU2BI X-Received: by 2002:a63:5346:: with SMTP id t6mr19373254pgl.40.1544635277000; Wed, 12 Dec 2018 09:21:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544635276; cv=none; d=google.com; s=arc-20160816; b=z2l19AHtAgB0KDNE+n0sLSqoznG/2OS/t07tl8i3dpKC92LfDlhcXiYRKaxHKrx5f7 YRyVVSXf/PK4TOp6ZdM/nUSXxY+KnGEu3BhePF4i1D8VAx0bZ8eEyoIyCy7y5K+Chw2K uSoDQZiSUNTbhvRz2lJ9NbfldmO3TIjPfdlI7rrRCTgiQhIJijUU7NNkPn70bxsIyQRF YJjs2Xx6Pa2zy3062DV++kGiYyMKrv4aGrbNn90xKeEqXn36uWjTapQ6hVR5hVpTZvAc 3E0Tg2pCpbUrToCzujXcdqK+9nU4/7y+aGchaQfiK9omYZg4nyP7oNgO6yFl+Q9sGia5 xVdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=K85Aa/32vK6FfAF6U4gVcsElFT6V6q1pS2TrQ21NG9M=; b=L1E2e47LFLrkmFRKinrGlXCbYtfiZ9fKpxePQUIoD9JKtDzjapSbrI2ilf65Ke46RY Cd4QM2c+SSxTVwA4i1wl1A4qVJecLcOz5u06z/N+5/R9Wi+2xMyZFQ1nmwuI7pld15YC 4DvoRaojsv0/ZpPoCrZOLgjLYqbmK6tCK9DEvaeSc7I2x87b/3Vd62lFid9zC1N0VhHU +Bj2Po9cU2HrhUi+E+A6jlGoeo9GtHSfHGStzaSCyvKWHUtGce/9bPk/OBzAWAo+rLBq FR2WDbX4gi48gQasF9E8RWqx4xiNXEuKETL7SK8Y6E8Nay4sVComfRzR2X4Gzr4uFlA7 w9Ag== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=X0xTX3PL; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a68si16131932pla.267.2018.12.12.09.21.02; Wed, 12 Dec 2018 09:21:16 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=X0xTX3PL; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728076AbeLLRT4 (ORCPT + 99 others); Wed, 12 Dec 2018 12:19:56 -0500 Received: from mail.kernel.org ([198.145.29.99]:36382 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728046AbeLLRTx (ORCPT ); Wed, 12 Dec 2018 12:19:53 -0500 Received: from sinanubuntu1604.mkjiurmyylmellclgttazegk5f.bx.internal.cloudapp.net (unknown [40.121.85.218]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C0D002086D; Wed, 12 Dec 2018 17:19:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1544635192; bh=2QQMOUZlNsKsy/dGrd7PrT/v3LUklYUweqAGijngjqs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=X0xTX3PLDXJFCLzojxE8ntSudwpMJIGhdDA1rKM6xJrt53ZM7g38IwIA7LUPbi9ib YBcBNoZt+W53pWE8+AF8bKce3LsPlMpLW8K9w+OsqofaLTYlwxzPsZeCtmiB1BLX44 tHOrcziNqFMx8L5pUPZ9Rf3Z4rSBaSVnnLwFwkjw= From: Sinan Kaya To: linux-acpi@vger.kernel.org Cc: Sinan Kaya , Robert Moore , Erik Schmauss , "Rafael J. Wysocki" , Len Brown , devel@acpica.org (open list:ACPI COMPONENT ARCHITECTURE (ACPICA)), linux-kernel@vger.kernel.org (open list) Subject: [PATCH v6 5/5] ACPICA: Remove PCI bits from ACPICA when CONFIG_PCI is unset Date: Wed, 12 Dec 2018 17:19:40 +0000 Message-Id: <20181212171941.7437-6-okaya@kernel.org> X-Mailer: git-send-email 2.19.0 In-Reply-To: <20181212171941.7437-1-okaya@kernel.org> References: <20181212171941.7437-1-okaya@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Now that we allow CONFIG_PCI to be unset, remove useless code from ACPICA too. Signed-off-by: Sinan Kaya --- drivers/acpi/acpica/Makefile | 2 +- drivers/acpi/acpica/achware.h | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/drivers/acpi/acpica/Makefile b/drivers/acpi/acpica/Makefile index b14621da5413..59700433a96e 100644 --- a/drivers/acpi/acpica/Makefile +++ b/drivers/acpi/acpica/Makefile @@ -77,13 +77,13 @@ acpi-y += \ hwacpi.o \ hwesleep.o \ hwgpe.o \ - hwpci.o \ hwregs.o \ hwsleep.o \ hwvalid.o \ hwxface.o \ hwxfsleep.o +acpi-$(CONFIG_PCI) += hwpci.o acpi-$(ACPI_FUTURE_USAGE) += hwtimer.o acpi-y += \ diff --git a/drivers/acpi/acpica/achware.h b/drivers/acpi/acpica/achware.h index 43ce67a9da1f..1c827184fe64 100644 --- a/drivers/acpi/acpica/achware.h +++ b/drivers/acpi/acpica/achware.h @@ -109,8 +109,17 @@ acpi_hw_enable_runtime_gpe_block(struct acpi_gpe_xrupt_info *gpe_xrupt_info, /* * hwpci - PCI configuration support */ +#ifdef CONFIG_PCI acpi_status acpi_hw_derive_pci_id(struct acpi_pci_id *pci_id, acpi_handle root_pci_device, acpi_handle pci_region); +#else +static inline acpi_status +acpi_hw_derive_pci_id(struct acpi_pci_id *pci_id, acpi_handle root_pci_device, + acpi_handle pci_region) +{ + return AE_SUPPORT; +} +#endif #endif /* __ACHWARE_H__ */ -- 2.19.0