net: dsa/slave: Fix compilation warnings

Currently when none of CONFIG_NET_DSA_TAG_DSA, CONFIG_NET_DSA_TAG_EDSA and
CONFIG_NET_DSA_TAG_TRAILER is defined, we get following compilation warnings:

net/dsa/slave.c:51:12: warning: 'dsa_slave_init' defined but not used [-Wunused-function]
net/dsa/slave.c:60:12: warning: 'dsa_slave_open' defined but not used [-Wunused-function]
net/dsa/slave.c:98:12: warning: 'dsa_slave_close' defined but not used [-Wunused-function]
net/dsa/slave.c:116:13: warning: 'dsa_slave_change_rx_flags' defined but not used [-Wunused-function]
net/dsa/slave.c:127:13: warning: 'dsa_slave_set_rx_mode' defined but not used [-Wunused-function]
net/dsa/slave.c:136:12: warning: 'dsa_slave_set_mac_address' defined but not used [-Wunused-function]
net/dsa/slave.c:164:12: warning: 'dsa_slave_ioctl' defined but not used [-Wunused-function]

Earlier approach to fix this was discussed here:

lkml.org/lkml/2012/10/29/549

This is another approach to fix it. This is done by some changes in config
options, which make more sense than the earlier approach. As, atleast one
tagging option must always be selected for using net/dsa/ infrastructure, this
patch selects NET_DSA from tagging configs instead of having it as an selectable
config.

Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
viresh kumar 2012-11-23 19:53:54 +00:00 committed by David S. Miller
parent a303fbf3db
commit 82167cb8c6
2 changed files with 9 additions and 8 deletions

View File

@ -1,5 +1,4 @@
menu "Distributed Switch Architecture drivers" menu "Distributed Switch Architecture drivers"
depends on NET_DSA
config NET_DSA_MV88E6XXX config NET_DSA_MV88E6XXX
tristate tristate

View File

@ -1,5 +1,5 @@
config NET_DSA config NET_DSA
tristate "Distributed Switch Architecture support" tristate
default n default n
depends on EXPERIMENTAL && NETDEVICES && !S390 depends on EXPERIMENTAL && NETDEVICES && !S390
select PHYLIB select PHYLIB
@ -8,19 +8,21 @@ config NET_DSA
the Distributed Switch Architecture. the Distributed Switch Architecture.
if NET_DSA menu "Distributed Switch Architecture support"
# tagging formats # tagging formats
config NET_DSA_TAG_DSA config NET_DSA_TAG_DSA
bool bool "Original DSA packet tagging format"
select NET_DSA
default n default n
config NET_DSA_TAG_EDSA config NET_DSA_TAG_EDSA
bool bool "Ethertype DSA packet tagging format"
select NET_DSA
default n default n
config NET_DSA_TAG_TRAILER config NET_DSA_TAG_TRAILER
bool bool "Trailer DSA packet tagging format"
select NET_DSA
default n default n
endmenu
endif