From: Sinan Kaya <okaya@kernel.org>
To: linux-acpi@vger.kernel.org
Cc: Sinan Kaya <okaya@kernel.org>,
Robert Moore <robert.moore@intel.com>,
Erik Schmauss <erik.schmauss@intel.com>,
"Rafael J. Wysocki" <rafael.j.wysocki@intel.com>,
Len Brown <lenb@kernel.org>,
"open list:ACPI COMPONENT ARCHITECTURE ACPICA" <devel@acpica.org>,
open list <linux-kernel@vger.kernel.org>
Subject: [PATCH v5 5/5] ACPI / OSL: Remove PCI bits from ACPICA when CONFIG_PCI is unset
Date: Wed, 12 Dec 2018 05:28:45 +0000 [thread overview]
Message-ID: <20181212052846.32370-6-okaya@kernel.org> (raw)
In-Reply-To: <20181212052846.32370-1-okaya@kernel.org>
Now that we allow CONFIG_PCI to be unset, remove useless code from ACPICA
too.
Signed-off-by: Sinan Kaya <okaya@kernel.org>
---
drivers/acpi/acpica/Makefile | 2 +-
drivers/acpi/osl.c | 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/osl.c b/drivers/acpi/osl.c
index 7b1e58f93f37..8b8eb17df3f2 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -1837,3 +1837,12 @@ acpi_status acpi_os_enter_sleep(u8 sleep_state,
reg_a_value, reg_b_value);
return status;
}
+
+#ifndef CONFIG_PCI
+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
+
--
2.19.0
WARNING: multiple messages have this Message-ID (diff)
From: Sinan Kaya <okaya@kernel.org>
To: linux-acpi@vger.kernel.org
Cc: Sinan Kaya <okaya@kernel.org>,
Robert Moore <robert.moore@intel.com>,
Erik Schmauss <erik.schmauss@intel.com>,
"Rafael J. Wysocki" <rafael.j.wysocki@intel.com>,
Len Brown <lenb@kernel.org>,
devel@acpica.org (open list:ACPI COMPONENT ARCHITECTURE (ACPICA)),
linux-kernel@vger.kernel.org (open list)
Subject: [PATCH v5 5/5] ACPI / OSL: Remove PCI bits from ACPICA when CONFIG_PCI is unset
Date: Wed, 12 Dec 2018 05:28:45 +0000 [thread overview]
Message-ID: <20181212052846.32370-6-okaya@kernel.org> (raw)
In-Reply-To: <20181212052846.32370-1-okaya@kernel.org>
Now that we allow CONFIG_PCI to be unset, remove useless code from ACPICA
too.
Signed-off-by: Sinan Kaya <okaya@kernel.org>
---
drivers/acpi/acpica/Makefile | 2 +-
drivers/acpi/osl.c | 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/osl.c b/drivers/acpi/osl.c
index 7b1e58f93f37..8b8eb17df3f2 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -1837,3 +1837,12 @@ acpi_status acpi_os_enter_sleep(u8 sleep_state,
reg_a_value, reg_b_value);
return status;
}
+
+#ifndef CONFIG_PCI
+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
+
--
2.19.0
next prev parent reply other threads:[~2018-12-12 5:28 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20181212052846.32370-1-okaya@kernel.org>
2018-12-12 5:28 ` [PATCH v5 1/5] ACPI: Allow CONFIG_PCI to be unset for reboot Sinan Kaya
2018-12-12 5:28 ` Sinan Kaya
2018-12-12 5:28 ` [PATCH v5 2/5] ACPI / OSL: Stub out acpi_os_read_pci_configuration when CONFIG_PCI is unset Sinan Kaya
2018-12-12 5:28 ` Sinan Kaya
2018-12-12 9:31 ` Rafael J. Wysocki
2018-12-12 5:28 ` [PATCH v5 3/5] ACPI / OSL: Stub out acpi_os_write_pci_configuration " Sinan Kaya
2018-12-12 5:28 ` Sinan Kaya
2018-12-12 5:28 ` [PATCH v5 4/5] PCI/ACPI: Allow ACPI to be built without CONFIG_PCI set Sinan Kaya
2018-12-12 5:28 ` Sinan Kaya
2018-12-12 5:28 ` Sinan Kaya [this message]
2018-12-12 5:28 ` [PATCH v5 5/5] ACPI / OSL: Remove PCI bits from ACPICA when CONFIG_PCI is unset Sinan Kaya
2018-12-12 9:25 [Devel] " Rafael J. Wysocki
2018-12-12 9:25 ` Rafael J. Wysocki
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181212052846.32370-6-okaya@kernel.org \
--to=okaya@kernel.org \
--cc=devel@acpica.org \
--cc=erik.schmauss@intel.com \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rafael.j.wysocki@intel.com \
--cc=robert.moore@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.