From patchwork Sat Nov 24 05:53:54 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 201442 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42E242C007D for ; Sat, 24 Nov 2012 16:55:40 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750966Ab2KXFzF (ORCPT ); Sat, 24 Nov 2012 00:55:05 -0500 Received: from mail-pb0-f46.google.com ([209.85.160.46]:39166 "EHLO mail-pb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750866Ab2KXFzE (ORCPT ); Sat, 24 Nov 2012 00:55:04 -0500 Received: by mail-pb0-f46.google.com with SMTP id wy7so6894885pbc.19 for ; Fri, 23 Nov 2012 21:55:02 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:x-gm-message-state; bh=+MDiCzVSk32v0tWdKNIGkZGCcNBHwGbxg26dDqgRC7U=; b=WwSBNma3LiIDIk2cINbuSEyNfMwAgF3sCa0hXje0VvELoB0YzXipdqS/ajYRASW+Is ANPpxqCjlNnv/LfJAO02ULvVM/QXnXCjY++vkenLOZvX8X9JgBsDUlqvJC2sHsgB4vfD ZUgIKwQc75ZbieWCQOkFd/zJc8DXe0nif+Gp4OxxGiGe8WacIYK0xz+onpnjn5tqYEDm iEWPeZtJyIB/XYpRN8uIzzR8XfviYtHPZ8gNiTQj99YciFuDVDkw+BBzNYUdOIPmcI8C qkRtCM2+bsHzTowaVva1A2u8eyInHqh516aJXiPNoU1JpYJNN1qL41coz927ByhTRzMq zV4A== Received: by 10.68.251.130 with SMTP id zk2mr19972537pbc.19.1353736501293; Fri, 23 Nov 2012 21:55:01 -0800 (PST) Received: from localhost ([122.167.245.93]) by mx.google.com with ESMTPS id sy1sm4953461pbc.66.2012.11.23.21.54.56 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 23 Nov 2012 21:54:59 -0800 (PST) From: Viresh Kumar To: bhutchings@solarflare.com, davem@davemloft.net, akpm@linux-foundation.org Cc: netdev@vger.kernel.org, linaro-dev@lists.linaro.org, linux-kernel@vger.kernel.org, patches@linaro.org, Viresh Kumar Subject: [PATCH V2 resend] net: dsa/slave: Fix compilation warnings Date: Sat, 24 Nov 2012 11:23:54 +0530 Message-Id: X-Mailer: git-send-email 1.7.12.rc2.18.g61b472e X-Gm-Message-State: ALoCoQk3bFWKXVcs6Bdj2ACtHyt3LXhaAMZmLMJoEpBFG+Pfg+2KfR5dsCxT0v6FmJqqvohcQJ/1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 --- I am resending it as the earlier thread is lost somewhere in Maintainers mailbox :) drivers/net/dsa/Kconfig | 1 - net/dsa/Kconfig | 16 +++++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/drivers/net/dsa/Kconfig b/drivers/net/dsa/Kconfig index dd151d5..96eae22 100644 --- a/drivers/net/dsa/Kconfig +++ b/drivers/net/dsa/Kconfig @@ -1,5 +1,4 @@ menu "Distributed Switch Architecture drivers" - depends on NET_DSA config NET_DSA_MV88E6XXX tristate diff --git a/net/dsa/Kconfig b/net/dsa/Kconfig index 9c09f6e..3588e54 100644 --- a/net/dsa/Kconfig +++ b/net/dsa/Kconfig @@ -1,5 +1,5 @@ config NET_DSA - tristate "Distributed Switch Architecture support" + tristate default n depends on NETDEVICES && !S390 select PHYLIB @@ -8,19 +8,21 @@ config NET_DSA the Distributed Switch Architecture. -if NET_DSA +menu "Distributed Switch Architecture support" # tagging formats config NET_DSA_TAG_DSA - bool + bool "Original DSA packet tagging format" + select NET_DSA default n config NET_DSA_TAG_EDSA - bool + bool "Ethertype DSA packet tagging format" + select NET_DSA default n config NET_DSA_TAG_TRAILER - bool + bool "Trailer DSA packet tagging format" + select NET_DSA default n - -endif +endmenu