| From bfd31a206bb6136caa5ba035bccd88bc75468603 Mon Sep 17 00:00:00 2001 |
| From: Geert Uytterhoeven <geert@linux-m68k.org> |
| Date: Fri, 22 Jun 2018 13:08:43 +0200 |
| Subject: [PATCH 1240/1795] net: Remove depends on HAS_DMA in case of platform |
| dependency |
| |
| Remove dependencies on HAS_DMA where a Kconfig symbol depends on another |
| symbol that implies HAS_DMA, and, optionally, on "|| COMPILE_TEST". |
| In most cases this other symbol is an architecture or platform specific |
| symbol, or PCI. |
| |
| Generic symbols and drivers without platform dependencies keep their |
| dependencies on HAS_DMA, to prevent compiling subsystems or drivers that |
| cannot work anyway. |
| |
| This simplifies the dependencies, and allows to improve compile-testing. |
| |
| Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> |
| Reviewed-by: Mark Brown <broonie@kernel.org> |
| Acked-by: Robin Murphy <robin.murphy@arm.com> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| (cherry picked from commit e020797b7def11c8feeb3ee5c1f48c12cb959def) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> |
| --- |
| drivers/net/ethernet/amd/Kconfig | 2 +- |
| drivers/net/ethernet/apm/xgene-v2/Kconfig | 1 - |
| drivers/net/ethernet/apm/xgene/Kconfig | 1 - |
| drivers/net/ethernet/arc/Kconfig | 6 ++++-- |
| drivers/net/ethernet/broadcom/Kconfig | 2 -- |
| drivers/net/ethernet/calxeda/Kconfig | 2 +- |
| drivers/net/ethernet/hisilicon/Kconfig | 2 +- |
| drivers/net/ethernet/marvell/Kconfig | 8 +++----- |
| drivers/net/ethernet/mellanox/mlxsw/Kconfig | 2 +- |
| drivers/net/ethernet/renesas/Kconfig | 2 -- |
| drivers/net/wireless/broadcom/brcm80211/Kconfig | 1 - |
| drivers/net/wireless/quantenna/qtnfmac/Kconfig | 2 +- |
| 12 files changed, 12 insertions(+), 19 deletions(-) |
| |
| diff --git a/drivers/net/ethernet/amd/Kconfig b/drivers/net/ethernet/amd/Kconfig |
| index a8e8f4e9c1bb..9e5cf5583c87 100644 |
| --- a/drivers/net/ethernet/amd/Kconfig |
| +++ b/drivers/net/ethernet/amd/Kconfig |
| @@ -173,7 +173,7 @@ config SUNLANCE |
| |
| config AMD_XGBE |
| tristate "AMD 10GbE Ethernet driver" |
| - depends on ((OF_NET && OF_ADDRESS) || ACPI || PCI) && HAS_IOMEM && HAS_DMA |
| + depends on ((OF_NET && OF_ADDRESS) || ACPI || PCI) && HAS_IOMEM |
| depends on X86 || ARM64 || COMPILE_TEST |
| select BITREVERSE |
| select CRC32 |
| diff --git a/drivers/net/ethernet/apm/xgene-v2/Kconfig b/drivers/net/ethernet/apm/xgene-v2/Kconfig |
| index 1205861b6318..eedd3f3dd22e 100644 |
| --- a/drivers/net/ethernet/apm/xgene-v2/Kconfig |
| +++ b/drivers/net/ethernet/apm/xgene-v2/Kconfig |
| @@ -1,6 +1,5 @@ |
| config NET_XGENE_V2 |
| tristate "APM X-Gene SoC Ethernet-v2 Driver" |
| - depends on HAS_DMA |
| depends on ARCH_XGENE || COMPILE_TEST |
| help |
| This is the Ethernet driver for the on-chip ethernet interface |
| diff --git a/drivers/net/ethernet/apm/xgene/Kconfig b/drivers/net/ethernet/apm/xgene/Kconfig |
| index afccb033177b..e4e33c900b57 100644 |
| --- a/drivers/net/ethernet/apm/xgene/Kconfig |
| +++ b/drivers/net/ethernet/apm/xgene/Kconfig |
| @@ -1,6 +1,5 @@ |
| config NET_XGENE |
| tristate "APM X-Gene SoC Ethernet Driver" |
| - depends on HAS_DMA |
| depends on ARCH_XGENE || COMPILE_TEST |
| select PHYLIB |
| select MDIO_XGENE |
| diff --git a/drivers/net/ethernet/arc/Kconfig b/drivers/net/ethernet/arc/Kconfig |
| index e743ddf46343..5d0ab8e74b68 100644 |
| --- a/drivers/net/ethernet/arc/Kconfig |
| +++ b/drivers/net/ethernet/arc/Kconfig |
| @@ -24,7 +24,8 @@ config ARC_EMAC_CORE |
| config ARC_EMAC |
| tristate "ARC EMAC support" |
| select ARC_EMAC_CORE |
| - depends on OF_IRQ && OF_NET && HAS_DMA && (ARC || COMPILE_TEST) |
| + depends on OF_IRQ && OF_NET |
| + depends on ARC || COMPILE_TEST |
| ---help--- |
| On some legacy ARC (Synopsys) FPGA boards such as ARCAngel4/ML50x |
| non-standard on-chip ethernet device ARC EMAC 10/100 is used. |
| @@ -33,7 +34,8 @@ config ARC_EMAC |
| config EMAC_ROCKCHIP |
| tristate "Rockchip EMAC support" |
| select ARC_EMAC_CORE |
| - depends on OF_IRQ && OF_NET && REGULATOR && HAS_DMA && (ARCH_ROCKCHIP || COMPILE_TEST) |
| + depends on OF_IRQ && OF_NET && REGULATOR |
| + depends on ARCH_ROCKCHIP || COMPILE_TEST |
| ---help--- |
| Support for Rockchip RK3036/RK3066/RK3188 EMAC ethernet controllers. |
| This selects Rockchip SoC glue layer support for the |
| diff --git a/drivers/net/ethernet/broadcom/Kconfig b/drivers/net/ethernet/broadcom/Kconfig |
| index 67134ece1107..5fb25d4f8591 100644 |
| --- a/drivers/net/ethernet/broadcom/Kconfig |
| +++ b/drivers/net/ethernet/broadcom/Kconfig |
| @@ -157,7 +157,6 @@ config BGMAC |
| config BGMAC_BCMA |
| tristate "Broadcom iProc GBit BCMA support" |
| depends on BCMA && BCMA_HOST_SOC |
| - depends on HAS_DMA |
| depends on BCM47XX || ARCH_BCM_5301X || COMPILE_TEST |
| select BGMAC |
| select PHYLIB |
| @@ -170,7 +169,6 @@ config BGMAC_BCMA |
| |
| config BGMAC_PLATFORM |
| tristate "Broadcom iProc GBit platform support" |
| - depends on HAS_DMA |
| depends on ARCH_BCM_IPROC || COMPILE_TEST |
| depends on OF |
| select BGMAC |
| diff --git a/drivers/net/ethernet/calxeda/Kconfig b/drivers/net/ethernet/calxeda/Kconfig |
| index 07d2201530d2..9fdd496b90ff 100644 |
| --- a/drivers/net/ethernet/calxeda/Kconfig |
| +++ b/drivers/net/ethernet/calxeda/Kconfig |
| @@ -1,6 +1,6 @@ |
| config NET_CALXEDA_XGMAC |
| tristate "Calxeda 1G/10G XGMAC Ethernet driver" |
| - depends on HAS_IOMEM && HAS_DMA |
| + depends on HAS_IOMEM |
| depends on ARCH_HIGHBANK || COMPILE_TEST |
| select CRC32 |
| help |
| diff --git a/drivers/net/ethernet/hisilicon/Kconfig b/drivers/net/ethernet/hisilicon/Kconfig |
| index 91c7bdb9b43c..444bb4a140d9 100644 |
| --- a/drivers/net/ethernet/hisilicon/Kconfig |
| +++ b/drivers/net/ethernet/hisilicon/Kconfig |
| @@ -5,7 +5,7 @@ |
| config NET_VENDOR_HISILICON |
| bool "Hisilicon devices" |
| default y |
| - depends on (OF || ACPI) && HAS_DMA |
| + depends on OF || ACPI |
| depends on ARM || ARM64 || COMPILE_TEST |
| ---help--- |
| If you have a network (Ethernet) card belonging to this class, say Y. |
| diff --git a/drivers/net/ethernet/marvell/Kconfig b/drivers/net/ethernet/marvell/Kconfig |
| index da6fb825afea..427fd075b164 100644 |
| --- a/drivers/net/ethernet/marvell/Kconfig |
| +++ b/drivers/net/ethernet/marvell/Kconfig |
| @@ -18,8 +18,8 @@ if NET_VENDOR_MARVELL |
| |
| config MV643XX_ETH |
| tristate "Marvell Discovery (643XX) and Orion ethernet support" |
| - depends on (MV64X60 || PPC32 || PLAT_ORION || COMPILE_TEST) && INET |
| - depends on HAS_DMA |
| + depends on MV64X60 || PPC32 || PLAT_ORION || COMPILE_TEST |
| + depends on INET |
| select PHYLIB |
| select MVMDIO |
| ---help--- |
| @@ -58,7 +58,6 @@ config MVNETA_BM_ENABLE |
| config MVNETA |
| tristate "Marvell Armada 370/38x/XP/37xx network interface support" |
| depends on ARCH_MVEBU || COMPILE_TEST |
| - depends on HAS_DMA |
| select MVMDIO |
| select FIXED_PHY |
| ---help--- |
| @@ -84,7 +83,6 @@ config MVNETA_BM |
| config MVPP2 |
| tristate "Marvell Armada 375/7K/8K network interface support" |
| depends on ARCH_MVEBU || COMPILE_TEST |
| - depends on HAS_DMA |
| select MVMDIO |
| ---help--- |
| This driver supports the network interface units in the |
| @@ -92,7 +90,7 @@ config MVPP2 |
| |
| config PXA168_ETH |
| tristate "Marvell pxa168 ethernet support" |
| - depends on HAS_IOMEM && HAS_DMA |
| + depends on HAS_IOMEM |
| depends on CPU_PXA168 || ARCH_BERLIN || COMPILE_TEST |
| select PHYLIB |
| ---help--- |
| diff --git a/drivers/net/ethernet/mellanox/mlxsw/Kconfig b/drivers/net/ethernet/mellanox/mlxsw/Kconfig |
| index d56eea310509..b591c8cc9896 100644 |
| --- a/drivers/net/ethernet/mellanox/mlxsw/Kconfig |
| +++ b/drivers/net/ethernet/mellanox/mlxsw/Kconfig |
| @@ -30,7 +30,7 @@ config MLXSW_CORE_THERMAL |
| |
| config MLXSW_PCI |
| tristate "PCI bus implementation for Mellanox Technologies Switch ASICs" |
| - depends on PCI && HAS_DMA && HAS_IOMEM && MLXSW_CORE |
| + depends on PCI && HAS_IOMEM && MLXSW_CORE |
| default m |
| ---help--- |
| This is PCI bus implementation for Mellanox Technologies Switch ASICs. |
| diff --git a/drivers/net/ethernet/renesas/Kconfig b/drivers/net/ethernet/renesas/Kconfig |
| index 27be51f0a421..f3f7477043ce 100644 |
| --- a/drivers/net/ethernet/renesas/Kconfig |
| +++ b/drivers/net/ethernet/renesas/Kconfig |
| @@ -17,7 +17,6 @@ if NET_VENDOR_RENESAS |
| |
| config SH_ETH |
| tristate "Renesas SuperH Ethernet support" |
| - depends on HAS_DMA |
| depends on ARCH_RENESAS || SUPERH || COMPILE_TEST |
| select CRC32 |
| select MII |
| @@ -31,7 +30,6 @@ config SH_ETH |
| |
| config RAVB |
| tristate "Renesas Ethernet AVB support" |
| - depends on HAS_DMA |
| depends on ARCH_RENESAS || COMPILE_TEST |
| select CRC32 |
| select MII |
| diff --git a/drivers/net/wireless/broadcom/brcm80211/Kconfig b/drivers/net/wireless/broadcom/brcm80211/Kconfig |
| index 9d99eb42d917..6acba67bca07 100644 |
| --- a/drivers/net/wireless/broadcom/brcm80211/Kconfig |
| +++ b/drivers/net/wireless/broadcom/brcm80211/Kconfig |
| @@ -60,7 +60,6 @@ config BRCMFMAC_PCIE |
| bool "PCIE bus interface support for FullMAC driver" |
| depends on BRCMFMAC |
| depends on PCI |
| - depends on HAS_DMA |
| select BRCMFMAC_PROTO_MSGBUF |
| select FW_LOADER |
| ---help--- |
| diff --git a/drivers/net/wireless/quantenna/qtnfmac/Kconfig b/drivers/net/wireless/quantenna/qtnfmac/Kconfig |
| index 025fa6018550..8d1492a90bd1 100644 |
| --- a/drivers/net/wireless/quantenna/qtnfmac/Kconfig |
| +++ b/drivers/net/wireless/quantenna/qtnfmac/Kconfig |
| @@ -7,7 +7,7 @@ config QTNFMAC |
| config QTNFMAC_PEARL_PCIE |
| tristate "Quantenna QSR10g PCIe support" |
| default n |
| - depends on HAS_DMA && PCI && CFG80211 |
| + depends on PCI && CFG80211 |
| select QTNFMAC |
| select FW_LOADER |
| select CRC32 |
| -- |
| 2.19.0 |
| |
