[PATCH v8 2/4] ACPI / OSL: Stub out acpi_os_(read/write)_pci_configurations()

Sinan Kaya
2018-12-14T03:13:01Z

Getting ready to allow CONFIG_PCI to be unset with ACPI enabled. Stub out
acpi_os_read_pci_configuration and acpi_os_write_pci_configuration
functions when CONFIG_PCI is not defined.

Signed-off-by: Sinan Kaya <okaya@kernel.org>
---
drivers/acpi/osl.c | 14 ++++++++++++++
1 file changed, 14 insertions(+)

diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index b48874b8e1ea..524fd5f33ea4 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -773,6 +773,7 @@ acpi_status
acpi_os_read_pci_configuration(struct acpi_pci_id * pci_id, u32 reg,
u64 *value, u32 width)
{
+#ifdef CONFIG_PCI
int result, size;
u32 value32;

@@ -799,12 +800,19 @@ acpi_os_read_pci_configuration(struct acpi_pci_id * pci_id, u32 reg,
*value = value32;

return (result ? AE_ERROR : AE_OK);
+#else
+ int rc;
+
+ rc = pr_warn_once("PCI configuration space access is not supported\n");
+ return rc ? AE_SUPPORT : AE_OK;
+#endif
}

acpi_status
acpi_os_write_pci_configuration(struct acpi_pci_id * pci_id, u32 reg,
u64 value, u32 width)
{
+#ifdef CONFIG_PCI
int result, size;

switch (width) {
@@ -826,6 +834,12 @@ acpi_os_write_pci_configuration(struct acpi_pci_id * pci_id, u32 reg,
reg, size, value);

return (result ? AE_ERROR : AE_OK);
+#else
+ int rc;
+
+ rc = pr_warn_once("PCI configuration space access is not supported\n");
+ return rc ? AE_SUPPORT : AE_OK;
+#endif
}

static void acpi_os_execute_deferred(struct work_struct *work)
--
2.19.0