[PATCH v2] mei: deduplicate X86 && PCI dependencies, make them apply to all subentries

From: kilobyte
Date: Tue Apr 25 2023 - 11:43:42 EST


From: Adam Borowski <kilobyte@xxxxxxxxxx>

The Kconfig "depends on X86 && PCI" line was repeated for 4 out of 6 config
symbols here -- which was both unnecessarily repetitive, and caused a
dormant problem for the two remaining symbols lacking the dependency.

Signed-off-by: Adam Borowski <kilobyte@xxxxxxxxxx>
---
v2: instead of adding new depends, wrap all of mei in "if..endif"

drivers/misc/mei/Kconfig | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/misc/mei/Kconfig b/drivers/misc/mei/Kconfig
index d21486d69df2..f2ab2696fa78 100644
--- a/drivers/misc/mei/Kconfig
+++ b/drivers/misc/mei/Kconfig
@@ -1,8 +1,8 @@
# SPDX-License-Identifier: GPL-2.0
# Copyright (c) 2003-2019, Intel Corporation. All rights reserved.
+if X86 && PCI
config INTEL_MEI
tristate "Intel Management Engine Interface"
- depends on X86 && PCI
help
The Intel Management Engine (Intel ME) provides Manageability,
Security and Media services for system containing Intel chipsets.
@@ -14,7 +14,6 @@ config INTEL_MEI
config INTEL_MEI_ME
tristate "ME Enabled Intel Chipsets"
select INTEL_MEI
- depends on X86 && PCI
help
MEI support for ME Enabled Intel chipsets.

@@ -39,7 +38,6 @@ config INTEL_MEI_ME
config INTEL_MEI_TXE
tristate "Intel Trusted Execution Environment with ME Interface"
select INTEL_MEI
- depends on X86 && PCI
help
MEI Support for Trusted Execution Environment device on Intel SoCs

@@ -50,7 +48,6 @@ config INTEL_MEI_GSC
tristate "Intel MEI GSC embedded device"
depends on INTEL_MEI
depends on INTEL_MEI_ME
- depends on X86 && PCI
depends on DRM_I915
help
Intel auxiliary driver for GSC devices embedded in Intel graphics devices.
@@ -63,3 +60,4 @@ config INTEL_MEI_GSC
source "drivers/misc/mei/hdcp/Kconfig"
source "drivers/misc/mei/pxp/Kconfig"

+endif
--
2.40.0