Commit 7fd78edc authored by Lee Jones's avatar Lee Jones Committed by David S. Miller
Browse files

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 <isdn@linux-pingi.de>
Cc: netdev@vger.kernel.org
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0062b15c

drivers/isdn/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -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)

drivers/isdn/i4l/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -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

drivers/isdn/i4l/isdn_common.c

+0 −4
Original line number Diff line number Diff line
@@ -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);

CRA Git | Maintained and supported by SUSTech CRA and CCSE