Patchwork [net-next,3/3] net: Add missing dependencies on NETDEVICES

login
register
mail settings
Submitter Ben Hutchings
Date June 18, 2013, 2:37 a.m.
Message ID <1371523025.3495.68.camel@deadeye.wl.decadent.org.uk>
Download mbox | patch
Permalink /patch/252097/
State Accepted
Delegated to: David Miller
Headers show

Comments

Ben Hutchings - June 18, 2013, 2:37 a.m.
ETRAX_ETHERNET selects ETHERNET and MII, which depend on NETDEVICES.
I don't think anything should select NETDEVICES, so make it a
dependency.  It also doesn't need to select or depend on ETHERNET,
which has nothing to do with the Ethernet library functions.

BPCTL selects MII, which depends on NETDEVICES.  But everything in the
drivers/staging/silicom directory is related to net devices, so make
NET_VENDOR_SILICOM depend on NETDEVICES and remove the now-redundant
dependencies on NET.

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
---
There are still a few staging dr

 arch/cris/arch-v10/drivers/Kconfig |    3 +--
 arch/cris/arch-v32/drivers/Kconfig |    3 +--
 drivers/staging/silicom/Kconfig    |    6 +++---
 3 files changed, 5 insertions(+), 7 deletions(-)
Ben Hutchings - June 18, 2013, 3:37 a.m.
On Tue, 2013-06-18 at 03:37 +0100, Ben Hutchings wrote:
> ETRAX_ETHERNET selects ETHERNET and MII, which depend on NETDEVICES.
> I don't think anything should select NETDEVICES, so make it a
> dependency.  It also doesn't need to select or depend on ETHERNET,
> which has nothing to do with the Ethernet library functions.
> 
> BPCTL selects MII, which depends on NETDEVICES.  But everything in the
> drivers/staging/silicom directory is related to net devices, so make
> NET_VENDOR_SILICOM depend on NETDEVICES and remove the now-redundant
> dependencies on NET.
> 
> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
> ---
> There are still a few staging dr
...ivers that are for net devices, yet don't depend on NETDEVICES.

Ben.
David Miller - June 20, 2013, 5:23 a.m.
From: Ben Hutchings <ben@decadent.org.uk>
Date: Tue, 18 Jun 2013 03:37:05 +0100

> ETRAX_ETHERNET selects ETHERNET and MII, which depend on NETDEVICES.
> I don't think anything should select NETDEVICES, so make it a
> dependency.  It also doesn't need to select or depend on ETHERNET,
> which has nothing to do with the Ethernet library functions.
> 
> BPCTL selects MII, which depends on NETDEVICES.  But everything in the
> drivers/staging/silicom directory is related to net devices, so make
> NET_VENDOR_SILICOM depend on NETDEVICES and remove the now-redundant
> dependencies on NET.
> 
> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>

Applied.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/arch/cris/arch-v10/drivers/Kconfig b/arch/cris/arch-v10/drivers/Kconfig
index 8eab0c6..daf5f19 100644
--- a/arch/cris/arch-v10/drivers/Kconfig
+++ b/arch/cris/arch-v10/drivers/Kconfig
@@ -2,8 +2,7 @@  if ETRAX_ARCH_V10
 
 config ETRAX_ETHERNET
 	bool "Ethernet support"
-	depends on ETRAX_ARCH_V10
-	select ETHERNET
+	depends on ETRAX_ARCH_V10 && NETDEVICES
 	select MII
 	help
 	  This option enables the ETRAX 100LX built-in 10/100Mbit Ethernet
diff --git a/arch/cris/arch-v32/drivers/Kconfig b/arch/cris/arch-v32/drivers/Kconfig
index 91c4e54..4f22350 100644
--- a/arch/cris/arch-v32/drivers/Kconfig
+++ b/arch/cris/arch-v32/drivers/Kconfig
@@ -2,8 +2,7 @@  if ETRAX_ARCH_V32
 
 config ETRAX_ETHERNET
 	bool "Ethernet support"
-	depends on ETRAX_ARCH_V32
-	select ETHERNET
+	depends on ETRAX_ARCH_V32 && NETDEVICES
 	select MII
 	help
 	  This option enables the ETRAX FS built-in 10/100Mbit Ethernet
diff --git a/drivers/staging/silicom/Kconfig b/drivers/staging/silicom/Kconfig
index fc082db..6651bd8 100644
--- a/drivers/staging/silicom/Kconfig
+++ b/drivers/staging/silicom/Kconfig
@@ -5,7 +5,7 @@ 
 config NET_VENDOR_SILICOM
 	bool "Silicom devices"
 	default y
-	depends on PCI
+	depends on PCI && NETDEVICES
 	---help---
 	  If you have a network card (Ethernet) belonging to this class,
 	  say Y.
@@ -19,7 +19,7 @@  if NET_VENDOR_SILICOM
 
 config SBYPASS
 	tristate "Silicom BypassCTL library support"
-	depends on PCI && NET
+	depends on PCI
 	depends on m
 	---help---
 	  If you have a network (Ethernet) controller of this type, say Y
@@ -29,7 +29,7 @@  config SBYPASS
 
 config BPCTL
 	tristate "Silicom BypassCTL net support"
-	depends on PCI && NET
+	depends on PCI
 	depends on m
 	select SBYPASS
 	select MII