IB: Move PCI dependency from root KConfig to HW's KConfigs

No reason to have dependency on PCI for the entire infiniband stack so
move it to KConfig of only the drivers that actually using PCI.

Signed-off-by: Yuval Shaia <yuval.shaia@oracle.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>

diff --git a/drivers/infiniband/Kconfig b/drivers/infiniband/Kconfig
index 3726205c8704d846e0b2bbd927efd20ecae3c51f..b62b3b1e09cd660ac7e046ef7de4c5fe60216a06 100644 (file)
--- a/drivers/infiniband/Kconfig
+++ b/drivers/infiniband/Kconfig
@@ -1,6 +1,5 @@
 menuconfig INFINIBAND
        tristate "InfiniBand support"
-       depends on PCI || BROKEN
        depends on HAS_IOMEM
        depends on NET
        depends on INET

diff --git a/drivers/infiniband/hw/i40iw/Kconfig b/drivers/infiniband/hw/i40iw/Kconfig
index 6e7d27a1406174439b6c87419aa43e0a992c3faa..f6d20ba88c03df3cae5710a13373919ff4c47e23 100644 (file)
--- a/drivers/infiniband/hw/i40iw/Kconfig
+++ b/drivers/infiniband/hw/i40iw/Kconfig
@@ -1,6 +1,7 @@
 config INFINIBAND_I40IW
        tristate "Intel(R) Ethernet X722 iWARP Driver"
        depends on INET && I40E
+       depends on PCI
        select GENERIC_ALLOCATOR
        ---help---
        Intel(R) Ethernet X722 iWARP Driver

diff --git a/drivers/infiniband/hw/qedr/Kconfig b/drivers/infiniband/hw/qedr/Kconfig
index 6c9f3923e8382cdc25e913283f6fe6e539fbcaf5..3feec8dddf416fcd2eaf1249471f347f0f7af5dc 100644 (file)
--- a/drivers/infiniband/hw/qedr/Kconfig
+++ b/drivers/infiniband/hw/qedr/Kconfig
@@ -1,6 +1,7 @@
 config INFINIBAND_QEDR
        tristate "QLogic RoCE driver"
        depends on 64BIT && QEDE
+       depends on PCI
        select QED_LL2
        select QED_RDMA
        ---help---

diff --git a/drivers/infiniband/hw/qib/Kconfig b/drivers/infiniband/hw/qib/Kconfig
index e0fdb9201423a316a6c4d5b60e1b1248c40d9b14..cb06314a2ae2a9b3f74533566cf7fab1a7e2e7dc 100644 (file)
--- a/drivers/infiniband/hw/qib/Kconfig
+++ b/drivers/infiniband/hw/qib/Kconfig
@@ -1,6 +1,7 @@
 config INFINIBAND_QIB
        tristate "Intel PCIe HCA support"
        depends on 64BIT && INFINIBAND_RDMAVT
+       depends on PCI
        ---help---
        This is a low-level driver for Intel PCIe QLE InfiniBand host
        channel adapters.  This driver does not support the Intel

diff --git a/drivers/infiniband/sw/rdmavt/Kconfig b/drivers/infiniband/sw/rdmavt/Kconfig
index fdd001ce13d871be4176ede4d3c78f8f51b46977..2b5513da7e8393ac2da5488c5417430492284976 100644 (file)
--- a/drivers/infiniband/sw/rdmavt/Kconfig
+++ b/drivers/infiniband/sw/rdmavt/Kconfig
@@ -1,6 +1,7 @@
 config INFINIBAND_RDMAVT
        tristate "RDMA verbs transport library"
        depends on 64BIT
+       depends on PCI
        select DMA_VIRT_OPS
        ---help---
        This is a common software verbs provider for RDMA networks.

diff --git a/drivers/infiniband/ulp/ipoib/ipoib_main.c b/drivers/infiniband/ulp/ipoib/ipoib_main.c
index bac95b509a9b2edc23af7b5e8505fc03acbb80c0..2b1b0f2da8fb314e4a3f5bf4d5ab99caec2f207a 100644 (file)
--- a/drivers/infiniband/ulp/ipoib/ipoib_main.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_main.c
@@ -51,7 +51,6 @@
 #include <net/addrconf.h>
 #include <linux/inetdevice.h>
 #include <rdma/ib_cache.h>
-#include <linux/pci.h>
 
 #define DRV_VERSION "1.0.0"
 

diff --git a/drivers/staging/lustre/lnet/Kconfig b/drivers/staging/lustre/lnet/Kconfig
index 2b5930150cdafeda14fde7e620b437ca6415a101..6bcb53d0c6f4a8ddd3285873fc02990775a8d415 100644 (file)
--- a/drivers/staging/lustre/lnet/Kconfig
+++ b/drivers/staging/lustre/lnet/Kconfig
@@ -34,7 +34,7 @@ config LNET_SELFTEST
 
 config LNET_XPRT_IB
        tristate "LNET infiniband support"
-       depends on LNET && INFINIBAND && INFINIBAND_ADDR_TRANS
+       depends on LNET && PCI && INFINIBAND && INFINIBAND_ADDR_TRANS
        default LNET && INFINIBAND
        help
          This option allows the LNET users to use infiniband as an