From patchwork Mon Jan 14 21:35:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 155590 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp4141787jaa; Mon, 14 Jan 2019 13:35:50 -0800 (PST) X-Google-Smtp-Source: ALg8bN44ZBQ9VZ13ppVJ9LGB3Zg3UFLHGiCNUZIBXXkkg9e64MXlofPJ6KruWMJRwMJyESHds0PT X-Received: by 2002:a17:902:d83:: with SMTP id 3mr564321plv.43.1547501750881; Mon, 14 Jan 2019 13:35:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547501750; cv=none; d=google.com; s=arc-20160816; b=ymoAxurEk3i6QWmTZz+3beakl2UxgDXQDvKMBUMjmpADgXiA+54BhtdlIJnMi2Si2g HhAMnnmgziYPF1T91yumLU/F3wy6fTucfWhoXEkZodd/sOZFjtYmfC9tJnxzZMYy3uw0 Yy5ojPOnmMGnQPz50gNgmaohGwsX7uGttmjq0bxmI5QvfktzBBUO+t208Iq5JyB9b2MV J7i+FoG30czn3I/6VlYnQM8Hu8bXzElrXGsYDuQMnp/UL6RX/XHKwgZEtx4NnXMn+DOG /zIUnxK6rgjHwVEuf6PClD+ajjXM6r9nXw0eLxaN9Qx3JdUAMturYDvnl/Lz9Dk/V+21 UYsA== 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 :message-id:date:subject:cc:to:from; bh=VFxSfBlIpfXhHdapMQNXFs7zylQd4xivQd76Us4yDW4=; b=PmcgwIKAFl/SumIpU/rd9JaW0zrI0wwAhKf2uWlFhsel4z7nxmPkrmw6vAw26mApGw dgs7cW9uUY8sKwO6mv1HrOG6BMXdQ5zFK2PvEUcjyBfS3B2ot3jsX0fv7OsZAsX2y7zu kNby/dAWb4GecvWok5ADiPmDox1vuis0yj0NfFRARzIC2SV/XYVa/bz1Xfj7eQQ2c54i +n5amYrJfh+KsSxstOhiOuRgt77CjsK4pMNWHKW3trKSs6uivqeAwuOf/EIA2vDeDtse CB5Ua/DOqqnS3kW/FaVBITxFRO5sgB5R4p6v6woPW8Wm+VAruszNh3wN1ZfXuevw1rLN PRFg== ARC-Authentication-Results: i=1; mx.google.com; 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=fail (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 q2si1331536plh.261.2019.01.14.13.35.50; Mon, 14 Jan 2019 13:35:50 -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; 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=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727067AbfANVft (ORCPT + 31 others); Mon, 14 Jan 2019 16:35:49 -0500 Received: from mail-ot1-f65.google.com ([209.85.210.65]:38792 "EHLO mail-ot1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726982AbfANVfs (ORCPT ); Mon, 14 Jan 2019 16:35:48 -0500 Received: by mail-ot1-f65.google.com with SMTP id e12so550895otl.5; Mon, 14 Jan 2019 13:35:48 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=VFxSfBlIpfXhHdapMQNXFs7zylQd4xivQd76Us4yDW4=; b=YmX3H4al8s+40YuwQUNRM/A6t2cfrS/fpSID1Dj6sKDeyRuFlobygjQuyL+Z2byer6 dfny/4+K/qaQ8p9UDlnHYHXFFEHcu2GBmnaJBPb6t4wdg/CQzkAAoDLwJ74VVEmGbCPI q6i57lfYJVDEeebzqu2Wxkgbndnpc2nIyfUcyGGgVrSPTihmdp5SMW5N1RFZhGoghq/b U8q+gTr67TiBk1V5UD3ZSA8G/Rwer5yDTtVr4dD8Ue9C5RmWnk2+MDFRv2Z2zmJx9pES OGD9RLUUTzmMTRynb0bPBHEK+7pUj4jvpUtr8k0SBWbaArATzXgISjeYL0JhuTLvcd9R P9IA== X-Gm-Message-State: AJcUukeXH+LRwG/x+J59BVZ8ZrrjrjWsUD+3ncR0nEBPz4i7joY0HvS6 EyH04SNuaxVVIcuYlodSfwFFN5Q= X-Received: by 2002:a9d:6191:: with SMTP id g17mr359317otk.56.1547501747476; Mon, 14 Jan 2019 13:35:47 -0800 (PST) Received: from xps15.herring.priv (24-155-109-49.dyn.grandenetworks.net. [24.155.109.49]) by smtp.googlemail.com with ESMTPSA id p129sm649701oif.17.2019.01.14.13.35.46 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 14 Jan 2019 13:35:46 -0800 (PST) From: Rob Herring To: Bjorn Helgaas Cc: linux-kernel@vger.kernel.org, Christoph Hellwig , linux-pci@vger.kernel.org Subject: [PATCH] PCI: Fix PCI kconfig menu organization Date: Mon, 14 Jan 2019 15:35:46 -0600 Message-Id: <20190114213546.9921-1-robh@kernel.org> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org After commit eb01d42a7778 ("PCI: consolidate PCI config entry in drivers/pci"), all the PCI kconfig options appear below "PCI support" rather than within a sub-menu. This is because menuconfig expects all kconfig entries to be enclosed in an if/endif section. Add the missing if/endif. With this, "depends on PCI" is redundant in the sub-menu entries and can be removed. Fixes: eb01d42a7778 ("PCI: consolidate PCI config entry in drivers/pci") Cc: Christoph Hellwig Cc: Bjorn Helgaas Cc: linux-pci@vger.kernel.org Signed-off-by: Rob Herring --- drivers/pci/Kconfig | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) -- 2.19.1 Reviewed-by: Christoph Hellwig diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig index 4310c7a4212e..2ab92409210a 100644 --- a/drivers/pci/Kconfig +++ b/drivers/pci/Kconfig @@ -21,13 +21,14 @@ menuconfig PCI support for PCI-X and the foundations for PCI Express support. Say 'Y' here unless you know what you are doing. +if PCI + config PCI_DOMAINS bool depends on PCI config PCI_DOMAINS_GENERIC bool - depends on PCI select PCI_DOMAINS config PCI_SYSCALL @@ -37,7 +38,6 @@ source "drivers/pci/pcie/Kconfig" config PCI_MSI bool "Message Signaled Interrupts (MSI and MSI-X)" - depends on PCI select GENERIC_MSI_IRQ help This allows device drivers to enable MSI (Message Signaled @@ -59,7 +59,6 @@ config PCI_MSI_IRQ_DOMAIN config PCI_QUIRKS default y bool "Enable PCI quirk workarounds" if EXPERT - depends on PCI help This enables workarounds for various PCI chipset bugs/quirks. Disable this only if your target machine is unaffected by PCI @@ -67,7 +66,7 @@ config PCI_QUIRKS config PCI_DEBUG bool "PCI Debugging" - depends on PCI && DEBUG_KERNEL + depends on DEBUG_KERNEL help Say Y here if you want the PCI core to produce a bunch of debug messages to the system log. Select this if you are having a @@ -77,7 +76,6 @@ config PCI_DEBUG config PCI_REALLOC_ENABLE_AUTO bool "Enable PCI resource re-allocation detection" - depends on PCI depends on PCI_IOV help Say Y here if you want the PCI core to detect if PCI resource @@ -90,7 +88,6 @@ config PCI_REALLOC_ENABLE_AUTO config PCI_STUB tristate "PCI Stub driver" - depends on PCI help Say Y or M here if you want be able to reserve a PCI device when it is going to be assigned to a guest operating system. @@ -99,7 +96,6 @@ config PCI_STUB config PCI_PF_STUB tristate "PCI PF Stub driver" - depends on PCI depends on PCI_IOV help Say Y or M here if you want to enable support for devices that @@ -111,7 +107,7 @@ config PCI_PF_STUB config XEN_PCIDEV_FRONTEND tristate "Xen PCI Frontend" - depends on PCI && X86 && XEN + depends on X86 && XEN select PCI_XEN select XEN_XENBUS_FRONTEND default y @@ -133,7 +129,6 @@ config PCI_BRIDGE_EMUL config PCI_IOV bool "PCI IOV support" - depends on PCI select PCI_ATS help I/O Virtualization is a PCI feature supported by some devices @@ -144,7 +139,6 @@ config PCI_IOV config PCI_PRI bool "PCI PRI support" - depends on PCI select PCI_ATS help PRI is the PCI Page Request Interface. It allows PCI devices that are @@ -154,7 +148,6 @@ config PCI_PRI config PCI_PASID bool "PCI PASID support" - depends on PCI select PCI_ATS help Process Address Space Identifiers (PASIDs) can be used by PCI devices @@ -167,7 +160,7 @@ config PCI_PASID config PCI_P2PDMA bool "PCI peer-to-peer transfer support" - depends on PCI && ZONE_DEVICE + depends on ZONE_DEVICE select GENERIC_ALLOCATOR help Enableѕ drivers to do PCI peer-to-peer transactions to and from @@ -184,12 +177,11 @@ config PCI_P2PDMA config PCI_LABEL def_bool y if (DMI || ACPI) - depends on PCI select NLS config PCI_HYPERV tristate "Hyper-V PCI Frontend" - depends on PCI && X86 && HYPERV && PCI_MSI && PCI_MSI_IRQ_DOMAIN && X86_64 + depends on X86 && HYPERV && PCI_MSI && PCI_MSI_IRQ_DOMAIN && X86_64 help The PCI device frontend driver allows the kernel to import arbitrary PCI devices from a PCI backend to support PCI driver domains. @@ -198,3 +190,5 @@ source "drivers/pci/hotplug/Kconfig" source "drivers/pci/controller/Kconfig" source "drivers/pci/endpoint/Kconfig" source "drivers/pci/switch/Kconfig" + +endif