From patchwork Wed Nov 7 09:55:03 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 12706 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 5148623E02 for ; Wed, 7 Nov 2012 09:55:29 +0000 (UTC) Received: from mail-ia0-f180.google.com (mail-ia0-f180.google.com [209.85.210.180]) by fiordland.canonical.com (Postfix) with ESMTP id B86E7A19D33 for ; Wed, 7 Nov 2012 09:55:28 +0000 (UTC) Received: by mail-ia0-f180.google.com with SMTP id f6so946772iag.11 for ; Wed, 07 Nov 2012 01:55:28 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:mime-version:content-type :content-transfer-encoding:x-gm-message-state; bh=TqNhr+aS8WPUTCDXAQmiht5Pyiqmg8rnQ7+XLh/kiz8=; b=ODw37k4HWytm/dQKPjPwbrSZ4LwkxR+n0PQH4CQW87mNalmJn7sN7OhGPFo6zsB3uP Ugjrstx0DGT0LyPlyXrK3fMIMSlNH9+wVw1T+CF3nUhSMl4DBzhGeHWxmZmBVgF4rtqb HPC9Q8ar40oZlFr2y40gnrEtgHyFp4OGG1se+lmQK7joxd79VwCzCz4YoWZuiR6e5cjC Ya+zKNCTXzsQkA0vcVaEeiaJo7a4Y+jSMQV60ovqPB/de3ef7rdXtZO+oCfrfbfN753s MAVtzcEwc2DUhht/vGmDfTt0zy3DQiDMkgZ3o025LQCPdP9fPu99p7kai1V4Jy9Mr9QJ obuQ== Received: by 10.50.237.69 with SMTP id va5mr1406362igc.62.1352282128154; Wed, 07 Nov 2012 01:55:28 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.67.148 with SMTP id n20csp191096igt; Wed, 7 Nov 2012 01:55:27 -0800 (PST) Received: by 10.216.203.1 with SMTP id e1mr1689239weo.103.1352282126867; Wed, 07 Nov 2012 01:55:26 -0800 (PST) Received: from mail-wi0-f181.google.com (mail-wi0-f181.google.com [209.85.212.181]) by mx.google.com with ESMTPS id eo6si1449308wib.20.2012.11.07.01.55.26 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 07 Nov 2012 01:55:26 -0800 (PST) Received-SPF: neutral (google.com: 209.85.212.181 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=209.85.212.181; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.181 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) smtp.mail=lee.jones@linaro.org Received: by mail-wi0-f181.google.com with SMTP id hq12so1058492wib.4 for ; Wed, 07 Nov 2012 01:55:26 -0800 (PST) Received: by 10.180.87.74 with SMTP id v10mr6506244wiz.21.1352282126162; Wed, 07 Nov 2012 01:55:26 -0800 (PST) Received: from laptop.vlan14.pylonone.local (79.Red-88-2-49.staticIP.rima-tde.net. [88.2.49.79]) by mx.google.com with ESMTPS id ei1sm2749390wid.7.2012.11.07.01.55.24 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 07 Nov 2012 01:55:25 -0800 (PST) From: Lee Jones To: linux-kernel@vger.kernel.org Cc: davem@davemloft.net, Lee Jones , Karsten Keil , netdev@vger.kernel.org Subject: [PATCH 1/1] isdn: Make CONFIG_ISDN depend on CONFIG_NETDEVICES Date: Wed, 7 Nov 2012 10:55:03 +0100 Message-Id: <1352282103-13665-1-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.9.5 MIME-Version: 1.0 X-Gm-Message-State: ALoCoQkCwIO2UVydpQaDpKykxLdXsuT7aPRJyWDqLJypti4ZsaYAMuKy7aFlM+yNL/ozSDrAT9mL 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 --- drivers/isdn/Kconfig | 2 +- drivers/isdn/i4l/Kconfig | 2 +- drivers/isdn/i4l/isdn_common.c | 4 ---- 3 files changed, 2 insertions(+), 6 deletions(-) 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);