From patchwork Mon Nov 5 10:31:26 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 197182 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 2D17C2C008B for ; Mon, 5 Nov 2012 21:31:48 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753812Ab2KEKbd (ORCPT ); Mon, 5 Nov 2012 05:31:33 -0500 Received: from mail-bk0-f46.google.com ([209.85.214.46]:57989 "EHLO mail-bk0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752788Ab2KEKbc (ORCPT ); Mon, 5 Nov 2012 05:31:32 -0500 Received: by mail-bk0-f46.google.com with SMTP id jk13so1889243bkc.19 for ; Mon, 05 Nov 2012 02:31:31 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:content-transfer-encoding :in-reply-to:user-agent:x-gm-message-state; bh=WFXP67DCvdFWaPfdaDi6O0mEyNZ/+vkPUzboe8KxQ7s=; b=JjH0/8tbHzeHSMFehwTAu+BKOS8YcuxySzbGK3BlkMW5SCSRKGfRE2bvXpREO7kgnn UP7a5kzOh0jLtoIPh4hy1xoI8UD3EepoJw7twWjrmxUXLAa4JDEp8UKcMuY3C2g2cH65 z64lJVW44JDDcvzyn/8VdEixrRydFjtJ8BYOeRNZlnbyxWUkQUPrFWjhk3Cw2Imwn5/o xs4lL+BJ376ctsqwKQ/I1oTdSS7eBj0aH66UXi3xY/spUrvI+Z05oW8oSXfCq0B5ud/K npqzDKTEAlpVjhEYpA1ToA4OkAh1o913at3Z+DBwrb7V9RG2n/kep/oe+n9EP5azVr0K ckqw== Received: by 10.204.146.19 with SMTP id f19mr2158204bkv.4.1352111491005; Mon, 05 Nov 2012 02:31:31 -0800 (PST) Received: from gmail.com (78.Red-88-2-49.staticIP.rima-tde.net. [88.2.49.78]) by mx.google.com with ESMTPS id s20sm9211724bkw.15.2012.11.05.02.31.28 (version=SSLv3 cipher=OTHER); Mon, 05 Nov 2012 02:31:30 -0800 (PST) Date: Mon, 5 Nov 2012 11:31:26 +0100 From: Lee Jones To: David Miller Cc: pebolle@tiscali.nl, linux-kernel@vger.kernel.org, isdn@linux-pingi.de, netdev@vger.kernel.org Subject: [PATCH 8/9] isdn: Make CONFIG_ISDN depend on CONFIG_NETDEVICES Message-ID: <20121105103126.GB5220@gmail.com> References: <20121103224832.GA24262@gmail.com> <1352024091.1434.17.camel@x61.thuisdomein> <20121104105332.GC27124@gmail.com> <20121104.123013.700345271120279281.davem@davemloft.net> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20121104.123013.700345271120279281.davem@davemloft.net> User-Agent: Mutt/1.5.21 (2010-09-15) X-Gm-Message-State: ALoCoQnyUkkVV0AA0FMePhqSIkR3kBlbrLiGH2Jb4jtzETiV16yx9O+4hH9MSYSlyg/THv+Zpb6A Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Does something like look like a better solution? Author: Lee Jones Date: Sat Nov 3 22:06:02 2012 +0100 isdn: Make CONFIG_ISDN depend on CONFIG_NETDEVICES It doesn't make much sense to enable ISDN services if you don't intend to connect to a network. Therefore insisting that ISDN depends on NETDEVICES seems logical. We can then remove any guards mentioning NETDEVICES inside all subordinate drivers. This also has the nice side-effect of fixing the warning below when ISDN_I4L && !CONFIG_NETDEVICES at compile time. This patch fixes: drivers/isdn/i4l/isdn_common.c: In function ‘isdn_ioctl’: drivers/isdn/i4l/isdn_common.c:1278:8: warning: unused variable ‘s’ [-Wunused-variable] Cc: Karsten Keil Cc: netdev@vger.kernel.org Signed-off-by: Lee Jones --- 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 diff --git a/drivers/isdn/Kconfig b/drivers/isdn/Kconfig index a233ed5..86cd75a 100644 --- a/drivers/isdn/Kconfig +++ b/drivers/isdn/Kconfig @@ -4,7 +4,7 @@ menuconfig ISDN bool "ISDN support" - depends on NET + depends on NET && NETDEVICES depends on !S390 && !UML ---help--- ISDN ("Integrated Services Digital Network", called RNIS in France) diff --git a/drivers/isdn/i4l/Kconfig b/drivers/isdn/i4l/Kconfig index 2302fbe..9c6650e 100644 --- a/drivers/isdn/i4l/Kconfig +++ b/drivers/isdn/i4l/Kconfig @@ -6,7 +6,7 @@ if ISDN_I4L config ISDN_PPP bool "Support synchronous PPP" - depends on INET && NETDEVICES + depends on INET select SLHC help Over digital connections such as ISDN, there is no need to diff --git a/drivers/isdn/i4l/isdn_common.c b/drivers/isdn/i4l/isdn_common.c index 8c610fa..e2a945e 100644 --- a/drivers/isdn/i4l/isdn_common.c +++ b/drivers/isdn/i4l/isdn_common.c @@ -1312,7 +1312,6 @@ isdn_ioctl(struct file *file, uint cmd, ulong arg) } else return -EINVAL; break; -#ifdef CONFIG_NETDEVICES case IIOCNETGPN: /* Get peer phone number of a connected * isdn network interface */ @@ -1322,7 +1321,6 @@ isdn_ioctl(struct file *file, uint cmd, ulong arg) return isdn_net_getpeer(&phone, argp); } else return -EINVAL; -#endif default: return -EINVAL; } @@ -1352,7 +1350,6 @@ isdn_ioctl(struct file *file, uint cmd, ulong arg) case IIOCNETLCR: printk(KERN_INFO "INFO: ISDN_ABC_LCR_SUPPORT not enabled\n"); return -ENODEV; -#ifdef CONFIG_NETDEVICES case IIOCNETAIF: /* Add a network-interface */ if (arg) { @@ -1491,7 +1488,6 @@ isdn_ioctl(struct file *file, uint cmd, ulong arg) return -EFAULT; return isdn_net_force_hangup(name); break; -#endif /* CONFIG_NETDEVICES */ case IIOCSETVER: dev->net_verbose = arg; printk(KERN_INFO "isdn: Verbose-Level is %d\n", dev->net_verbose);