[1/5] isdn: gigaset: remove i4l support

Message ID 20190423151143.464992-8-arnd@arndb.de
State Superseded
Headers show
Series
  • isdn: deprecate non-mISDN drivers
Related show

Commit Message

Arnd Bergmann April 23, 2019, 3:11 p.m.
isdn4linux is getting removed, and the gigaset driver can still
use the CAPI support, so this can all go away.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

---
 Documentation/isdn/README.gigaset |  36 +-
 drivers/isdn/gigaset/Kconfig      |  22 +-
 drivers/isdn/gigaset/Makefile     |   5 +-
 drivers/isdn/gigaset/dummyll.c    |  77 ----
 drivers/isdn/gigaset/i4l.c        | 695 ------------------------------
 5 files changed, 10 insertions(+), 825 deletions(-)
 delete mode 100644 drivers/isdn/gigaset/dummyll.c
 delete mode 100644 drivers/isdn/gigaset/i4l.c

diff --git a/drivers/isdn/gigaset/dummyll.c b/drivers/isdn/gigaset/dummyll.c
deleted file mode 100644
index 570c2d53b84e..000000000000
diff --git a/drivers/isdn/gigaset/i4l.c b/drivers/isdn/gigaset/i4l.c
deleted file mode 100644
index b5b389e95edd..000000000000
-- 
2.20.0

Comments

Paul Bolle April 24, 2019, 8:53 a.m. | #1
Arnd Bergmann schreef op di 23-04-2019 om 17:11 [+0200]:
> --- a/drivers/isdn/gigaset/Kconfig

> +++ b/drivers/isdn/gigaset/Kconfig

> @@ -1,6 +1,7 @@

>  menuconfig ISDN_DRV_GIGASET

>  	tristate "Siemens Gigaset support"

>  	depends on TTY

> +	depends on ISDN_CAPI

>  	select CRC_CCITT

>  	select BITREVERSE

>  	help

> @@ -17,27 +18,6 @@ menuconfig ISDN_DRV_GIGASET

>  

>  if ISDN_DRV_GIGASET

>  

> -config GIGASET_CAPI

> -	bool "Gigaset CAPI support"

> -	depends on ISDN_CAPI='y'||(ISDN_CAPI='m'&&ISDN_DRV_GIGASET='m')

> -	default 'y'

> -	help

> -	  Build the Gigaset driver as a CAPI 2.0 driver interfacing with

> -	  the Kernel CAPI subsystem. To use it with the old ISDN4Linux

> -	  subsystem you'll have to enable the capidrv glue driver.

> -	  (select ISDN_CAPI_CAPIDRV.)

> -	  Say N to build the old native ISDN4Linux variant.

> -	  If unsure, say Y.

> -

> -config GIGASET_I4L

> -	bool

> -	depends on ISDN_I4L='y'||(ISDN_I4L='m'&&ISDN_DRV_GIGASET='m')

> -	default !GIGASET_CAPI

> -

> -config GIGASET_DUMMYLL

> -	bool

> -	default !GIGASET_CAPI&&!GIGASET_I4L

> -


The dummyll code allows people using gigaset hardware for voice only to fiddle
with its settings, retrieve call logs, etc. So in theory dropping i4l support
doesn't require dropping dummyll support.

>  config GIGASET_BASE

>  	tristate "Gigaset base station support"

>  	depends on USB


Thanks,


Paul Bolle
Arnd Bergmann April 24, 2019, 12:33 p.m. | #2
On Wed, Apr 24, 2019 at 10:53 AM Paul Bolle <pebolle@tiscali.nl> wrote:
>

> Arnd Bergmann schreef op di 23-04-2019 om 17:11 [+0200]:

> > --- a/drivers/isdn/gigaset/Kconfig

> > +++ b/drivers/isdn/gigaset/Kconfig

> > @@ -1,6 +1,7 @@

> >  menuconfig ISDN_DRV_GIGASET

> >       tristate "Siemens Gigaset support"

> >       depends on TTY

> > +     depends on ISDN_CAPI

> >       select CRC_CCITT

> >       select BITREVERSE

> >       help

> > @@ -17,27 +18,6 @@ menuconfig ISDN_DRV_GIGASET

> >

> >  if ISDN_DRV_GIGASET

> >

> > -config GIGASET_CAPI

> > -     bool "Gigaset CAPI support"

> > -     depends on ISDN_CAPI='y'||(ISDN_CAPI='m'&&ISDN_DRV_GIGASET='m')

> > -     default 'y'

> > -     help

> > -       Build the Gigaset driver as a CAPI 2.0 driver interfacing with

> > -       the Kernel CAPI subsystem. To use it with the old ISDN4Linux

> > -       subsystem you'll have to enable the capidrv glue driver.

> > -       (select ISDN_CAPI_CAPIDRV.)

> > -       Say N to build the old native ISDN4Linux variant.

> > -       If unsure, say Y.

> > -

> > -config GIGASET_I4L

> > -     bool

> > -     depends on ISDN_I4L='y'||(ISDN_I4L='m'&&ISDN_DRV_GIGASET='m')

> > -     default !GIGASET_CAPI

> > -

> > -config GIGASET_DUMMYLL

> > -     bool

> > -     default !GIGASET_CAPI&&!GIGASET_I4L

> > -

>

> The dummyll code allows people using gigaset hardware for voice only to fiddle

> with its settings, retrieve call logs, etc. So in theory dropping i4l support

> doesn't require dropping dummyll support.


Ok, I'll rework that part, thanks for taking a look!

      Arnd

Patch

diff --git a/Documentation/isdn/README.gigaset b/Documentation/isdn/README.gigaset
index 9b1ce277ca3d..f6184b637182 100644
--- a/Documentation/isdn/README.gigaset
+++ b/Documentation/isdn/README.gigaset
@@ -48,9 +48,8 @@  GigaSet 307x Device Driver
 
 1.2. Software
      --------
-     The driver works with the Kernel CAPI subsystem as well as the old
-     ISDN4Linux subsystem, so it can be used with any software which is able
-     to use CAPI 2.0 or ISDN4Linux for ISDN connections (voice or data).
+     The driver works with the Kernel CAPI subsystem and can be used with any
+     software which is able to use CAPI 2.0 for ISDN connections (voice or data).
 
      There are some user space tools available at
      https://sourceforge.net/projects/gigaset307x/
@@ -92,7 +91,7 @@  GigaSet 307x Device Driver
 	gigaset	 	debug	   debug level (see section 3.2.)
 
 			startmode  initial operation mode (see section 2.5.):
-	bas_gigaset )		   1=ISDN4linux/CAPI (default), 0=Unimodem
+	bas_gigaset )		   1=CAPI (default), 0=Unimodem
 	ser_gigaset )
 	usb_gigaset )	cidmode    initial Call-ID mode setting (see section
 				   2.5.): 1=on (default), 0=off
@@ -154,18 +153,10 @@  GigaSet 307x Device Driver
 
 2.3. CAPI
      ----
-     If the driver is compiled with CAPI support (kernel configuration option
-     GIGASET_CAPI) the devices will show up as CAPI controllers as soon as the
-     corresponding driver module is loaded, and can then be used with CAPI 2.0
-     kernel and user space applications. For user space access, the module
-     capi.ko must be loaded.
-
-     Legacy ISDN4Linux applications are supported via the capidrv
-     compatibility driver. The kernel module capidrv.ko must be loaded
-     explicitly with the command
-        modprobe capidrv
-     if needed, and cannot be unloaded again without unloading the driver
-     first. (These are limitations of capidrv.)
+     The devices will show up as CAPI controllers as soon as the
+     corresponding driver module is loaded, and can then be used with
+     CAPI 2.0 kernel and user space applications. For user space access,
+     the module capi.ko must be loaded.
 
      Most distributions handle loading and unloading of the various CAPI
      modules automatically via the command capiinit(1) from the capi4k-utils
@@ -173,16 +164,6 @@  GigaSet 307x Device Driver
      Gigaset drivers because it doesn't support more than one module per
      driver.
 
-2.4. ISDN4Linux
-     ----------
-     If the driver is compiled without CAPI support (native ISDN4Linux
-     variant), it registers the device with the legacy ISDN4Linux subsystem
-     after loading the module. It can then be used with ISDN4Linux
-     applications only. Most distributions provide some configuration utility
-     for setting up that subsystem. Otherwise you can use some HOWTOs like
-         http://www.linuxhaven.de/dlhp/HOWTO/DE-ISDN-HOWTO-5.html
-
-
 2.5. Unimodem mode
      -------------
      In this mode the device works like a modem connected to a serial port
@@ -281,8 +262,7 @@  GigaSet 307x Device Driver
      number. Dialing "***" (three asterisks) calls all extensions
      simultaneously (global call).
 
-     This holds for both CAPI 2.0 and ISDN4Linux applications. Unimodem mode
-     does not support internal calls.
+     Unimodem mode does not support internal calls.
 
 2.8. Unregistered Wireless Devices (M101/M105)
      -----------------------------------------
diff --git a/drivers/isdn/gigaset/Kconfig b/drivers/isdn/gigaset/Kconfig
index 83f62b8d82b5..805b5d034feb 100644
--- a/drivers/isdn/gigaset/Kconfig
+++ b/drivers/isdn/gigaset/Kconfig
@@ -1,6 +1,7 @@ 
 menuconfig ISDN_DRV_GIGASET
 	tristate "Siemens Gigaset support"
 	depends on TTY
+	depends on ISDN_CAPI
 	select CRC_CCITT
 	select BITREVERSE
 	help
@@ -17,27 +18,6 @@  menuconfig ISDN_DRV_GIGASET
 
 if ISDN_DRV_GIGASET
 
-config GIGASET_CAPI
-	bool "Gigaset CAPI support"
-	depends on ISDN_CAPI='y'||(ISDN_CAPI='m'&&ISDN_DRV_GIGASET='m')
-	default 'y'
-	help
-	  Build the Gigaset driver as a CAPI 2.0 driver interfacing with
-	  the Kernel CAPI subsystem. To use it with the old ISDN4Linux
-	  subsystem you'll have to enable the capidrv glue driver.
-	  (select ISDN_CAPI_CAPIDRV.)
-	  Say N to build the old native ISDN4Linux variant.
-	  If unsure, say Y.
-
-config GIGASET_I4L
-	bool
-	depends on ISDN_I4L='y'||(ISDN_I4L='m'&&ISDN_DRV_GIGASET='m')
-	default !GIGASET_CAPI
-
-config GIGASET_DUMMYLL
-	bool
-	default !GIGASET_CAPI&&!GIGASET_I4L
-
 config GIGASET_BASE
 	tristate "Gigaset base station support"
 	depends on USB
diff --git a/drivers/isdn/gigaset/Makefile b/drivers/isdn/gigaset/Makefile
index ac45a2739f56..f8ba14735bf1 100644
--- a/drivers/isdn/gigaset/Makefile
+++ b/drivers/isdn/gigaset/Makefile
@@ -1,8 +1,5 @@ 
 # SPDX-License-Identifier: GPL-2.0
-gigaset-y := common.o interface.o proc.o ev-layer.o asyncdata.o
-gigaset-$(CONFIG_GIGASET_CAPI) += capi.o
-gigaset-$(CONFIG_GIGASET_I4L) += i4l.o
-gigaset-$(CONFIG_GIGASET_DUMMYLL) += dummyll.o
+gigaset-y := common.o interface.o proc.o ev-layer.o asyncdata.o capi.o
 usb_gigaset-y := usb-gigaset.o
 ser_gigaset-y := ser-gigaset.o
 bas_gigaset-y := bas-gigaset.o isocdata.o