lkml.org 
[lkml]   [2018]   [Dec]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
SubjectRE: [PATCH v6 5/5] ACPICA: Remove PCI bits from ACPICA when CONFIG_PCI is unset
Date


> -----Original Message-----
> From: Sinan Kaya [mailto:okaya@kernel.org]
> Sent: Wednesday, December 12, 2018 9:20 AM
> To: linux-acpi@vger.kernel.org
> Cc: Sinan Kaya <okaya@kernel.org>; Moore, Robert
> <robert.moore@intel.com>; Schmauss, Erik <erik.schmauss@intel.com>;
> Wysocki, Rafael J <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 v6 5/5] ACPICA: Remove PCI bits from ACPICA when
> CONFIG_PCI is unset
>
> 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/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,

CONFIG_PCI is a Linux-ism. We should stay with the OS-independent nature of
ACPICA. Please use ACPI_PCI_CONFIGURED and put it above the comment like so:

#ifdef ACPI_PCI_CONFIGURED
> /*
> * 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

\
 
 \ /
  Last update: 2018-12-12 20:03    [W:0.059 / U:1.252 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site