All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH v2 0/5] isdn: deprecate non-mISDN drivers
@ 2019-04-26 19:58 Arnd Bergmann
  2019-04-26 19:58 ` [PATCH v2 1/5] isdn: gigaset: remove i4l support Arnd Bergmann
                   ` (4 more replies)
  0 siblings, 5 replies; 12+ messages in thread
From: Arnd Bergmann @ 2019-04-26 19:58 UTC (permalink / raw)
  To: netdev
  Cc: isdn4linux, Karsten Keil, Paul Bolle, Holger Schurig,
	Tilman Schmidt, Al Viro, gigaset307x-common, arnd,
	Thomas Jarosch, Birger Harzenetter

When isdn4linux came up in the context of another patch series, I
remembered that we had discussed removing it a while ago.

It turns out that the suggestion from Karsten Keil wa to remove I4L
in 2018 after the last public ISDN networks are shut down. This has
happened now (with a very small number of exceptions), so I guess it's
time to try again.

We currently have three ISDN stacks in the kernel: the original
isdn4linux (with the hisax driver), the newer CAPI (with four drivers),
and finally the mISDN stack (supporting roughly the same hardware as
hisax).

As far as I can tell, anyone using ISDN with mainline kernel drivers in
the past few years uses mISDN, and this is typically used for voice-only
PBX installations that don't require a public network.

The older stacks support additional features for data networks, but those
typically make no sense any more if there is no network to connect to.

My proposal for this time is to kill off isdn4linux entirely, as it seems
to have been unusable for quite a while. This code has been abandoned
for many years and it does cause problems for treewide maintenance as
it tends to do everything that we try to stop doing.
Birger Harzenetter mentioned that is is still using i4l in order to
make use of the 'divert' feature that is not part of mISDN, but has
otherwise moved on to mISDN for normal operation, like apparently
everyone else.

CAPI in turn is not quite as obsolete, but two of the drivers (avm
and hysdn) don't seem to be used at all, while another one (gigaset)
will stop being maintained as Paul Bolle is no longer able to
test it after the network gets shut down in September.
All three are now moved into drivers/staging to let others speak
up in case there are remaining users.
This leaves Bluetooth CMTP as the only remaining user of CAPI, but
Marcel Holtmann wishes to keep maintaining it.

For the discussion on version 1, see [2]
Unfortunately, Karsten Keil as the maintainer has not participated in
the discussion.

      Arnd

[1] https://patchwork.kernel.org/patch/8484861/#17900371
[2] https://listserv.isdn4linux.de/pipermail/isdn4linux/2019-April/thread.html

Changes since v1:
- keep dummyll backend in gigaset driver
- don't remove capi core layer to keep cmtp working
- update changelog texts according to mailing list discussion
- rebase on net-next

Arnd Bergmann (5):
  isdn: gigaset: remove i4l support
  isdn: remove hisax driver
  isdn: remove isdn4linux
  isdn: hdlc: move into mISDN
  isdn: move capi drivers to staging

 Documentation/isdn/HiSax.cert                 |   96 -
 Documentation/isdn/INTERFACE                  |  759 ----
 Documentation/isdn/INTERFACE.fax              |  163 -
 Documentation/isdn/README                     |  599 ---
 Documentation/isdn/README.FAQ                 |   26 -
 Documentation/isdn/README.HiSax               |  659 ---
 Documentation/isdn/README.audio               |  138 -
 Documentation/isdn/README.concap              |  259 --
 Documentation/isdn/README.diversion           |  127 -
 Documentation/isdn/README.fax                 |   45 -
 Documentation/isdn/README.gigaset             |   36 +-
 Documentation/isdn/README.hfc-pci             |   41 -
 Documentation/isdn/README.syncppp             |   58 -
 Documentation/isdn/README.x25                 |  184 -
 Documentation/isdn/syncPPP.FAQ                |  224 -
 Documentation/process/changes.rst             |   16 +-
 MAINTAINERS                                   |   22 +-
 drivers/isdn/Kconfig                          |   51 -
 drivers/isdn/Makefile                         |    6 -
 drivers/isdn/capi/Kconfig                     |   29 +-
 drivers/isdn/capi/Makefile                    |    2 +
 drivers/isdn/capi/capidrv.c                   | 2525 -----------
 drivers/isdn/capi/capidrv.h                   |  140 -
 drivers/isdn/divert/Makefile                  |    9 -
 drivers/isdn/divert/divert_init.c             |   82 -
 drivers/isdn/divert/divert_procfs.c           |  336 --
 drivers/isdn/divert/isdn_divert.c             |  846 ----
 drivers/isdn/divert/isdn_divert.h             |  132 -
 drivers/isdn/gigaset/dummyll.c                |   77 -
 drivers/isdn/gigaset/i4l.c                    |  695 ---
 drivers/isdn/hardware/Kconfig                 |    7 -
 drivers/isdn/hardware/Makefile                |    1 -
 drivers/isdn/hardware/mISDN/Kconfig           |    7 +-
 drivers/isdn/hardware/mISDN/Makefile          |    2 +
 .../isdn/{i4l => hardware/mISDN}/isdnhdlc.c   |    2 +-
 .../isdn/hardware/mISDN/isdnhdlc.h            |    0
 drivers/isdn/hardware/mISDN/netjet.c          |    2 +-
 drivers/isdn/hisax/Kconfig                    |  422 --
 drivers/isdn/hisax/Makefile                   |   60 -
 drivers/isdn/hisax/amd7930_fn.c               |  794 ----
 drivers/isdn/hisax/amd7930_fn.h               |   37 -
 drivers/isdn/hisax/arcofi.c                   |  131 -
 drivers/isdn/hisax/arcofi.h                   |   27 -
 drivers/isdn/hisax/asuscom.c                  |  423 --
 drivers/isdn/hisax/avm_a1.c                   |  307 --
 drivers/isdn/hisax/avm_a1p.c                  |  267 --
 drivers/isdn/hisax/avm_pci.c                  |  904 ----
 drivers/isdn/hisax/avma1_cs.c                 |  162 -
 drivers/isdn/hisax/bkm_a4t.c                  |  358 --
 drivers/isdn/hisax/bkm_a8.c                   |  433 --
 drivers/isdn/hisax/bkm_ax.h                   |  119 -
 drivers/isdn/hisax/callc.c                    | 1792 --------
 drivers/isdn/hisax/config.c                   | 1993 ---------
 drivers/isdn/hisax/diva.c                     | 1282 ------
 drivers/isdn/hisax/elsa.c                     | 1245 ------
 drivers/isdn/hisax/elsa_cs.c                  |  218 -
 drivers/isdn/hisax/elsa_ser.c                 |  659 ---
 drivers/isdn/hisax/enternow_pci.c             |  420 --
 drivers/isdn/hisax/fsm.c                      |  161 -
 drivers/isdn/hisax/fsm.h                      |   61 -
 drivers/isdn/hisax/gazel.c                    |  691 ---
 drivers/isdn/hisax/hfc4s8s_l1.c               | 1584 -------
 drivers/isdn/hisax/hfc4s8s_l1.h               |   89 -
 drivers/isdn/hisax/hfc_2bds0.c                | 1078 -----
 drivers/isdn/hisax/hfc_2bds0.h                |  128 -
 drivers/isdn/hisax/hfc_2bs0.c                 |  591 ---
 drivers/isdn/hisax/hfc_2bs0.h                 |   60 -
 drivers/isdn/hisax/hfc_pci.c                  | 1755 --------
 drivers/isdn/hisax/hfc_pci.h                  |  235 --
 drivers/isdn/hisax/hfc_sx.c                   | 1517 -------
 drivers/isdn/hisax/hfc_sx.h                   |  196 -
 drivers/isdn/hisax/hfc_usb.c                  | 1608 -------
 drivers/isdn/hisax/hfc_usb.h                  |  208 -
 drivers/isdn/hisax/hfcscard.c                 |  261 --
 drivers/isdn/hisax/hisax.h                    | 1352 ------
 drivers/isdn/hisax/hisax_cfg.h                |   66 -
 drivers/isdn/hisax/hisax_debug.h              |   80 -
 drivers/isdn/hisax/hisax_fcpcipnp.c           | 1024 -----
 drivers/isdn/hisax/hisax_fcpcipnp.h           |   58 -
 drivers/isdn/hisax/hisax_if.h                 |   66 -
 drivers/isdn/hisax/hisax_isac.c               |  895 ----
 drivers/isdn/hisax/hisax_isac.h               |   46 -
 drivers/isdn/hisax/hscx.c                     |  277 --
 drivers/isdn/hisax/hscx.h                     |   41 -
 drivers/isdn/hisax/hscx_irq.c                 |  294 --
 drivers/isdn/hisax/icc.c                      |  680 ---
 drivers/isdn/hisax/icc.h                      |   72 -
 drivers/isdn/hisax/ipac.h                     |   29 -
 drivers/isdn/hisax/ipacx.c                    |  913 ----
 drivers/isdn/hisax/ipacx.h                    |  162 -
 drivers/isdn/hisax/isac.c                     |  681 ---
 drivers/isdn/hisax/isac.h                     |   70 -
 drivers/isdn/hisax/isar.c                     | 1910 ---------
 drivers/isdn/hisax/isar.h                     |  222 -
 drivers/isdn/hisax/isdnl1.c                   |  930 ----
 drivers/isdn/hisax/isdnl1.h                   |   32 -
 drivers/isdn/hisax/isdnl2.c                   | 1839 --------
 drivers/isdn/hisax/isdnl2.h                   |   25 -
 drivers/isdn/hisax/isdnl3.c                   |  594 ---
 drivers/isdn/hisax/isdnl3.h                   |   42 -
 drivers/isdn/hisax/isurf.c                    |  305 --
 drivers/isdn/hisax/ix1_micro.c                |  316 --
 drivers/isdn/hisax/jade.c                     |  305 --
 drivers/isdn/hisax/jade.h                     |  134 -
 drivers/isdn/hisax/jade_irq.c                 |  238 --
 drivers/isdn/hisax/l3_1tr6.c                  |  932 ----
 drivers/isdn/hisax/l3_1tr6.h                  |  164 -
 drivers/isdn/hisax/l3dss1.c                   | 3227 --------------
 drivers/isdn/hisax/l3dss1.h                   |  124 -
 drivers/isdn/hisax/l3ni1.c                    | 3182 --------------
 drivers/isdn/hisax/l3ni1.h                    |  136 -
 drivers/isdn/hisax/lmgr.c                     |   50 -
 drivers/isdn/hisax/mic.c                      |  235 --
 drivers/isdn/hisax/netjet.c                   |  985 -----
 drivers/isdn/hisax/netjet.h                   |   69 -
 drivers/isdn/hisax/niccy.c                    |  380 --
 drivers/isdn/hisax/nj_s.c                     |  294 --
 drivers/isdn/hisax/nj_u.c                     |  258 --
 drivers/isdn/hisax/q931.c                     | 1513 -------
 drivers/isdn/hisax/s0box.c                    |  260 --
 drivers/isdn/hisax/saphir.c                   |  296 --
 drivers/isdn/hisax/sedlbauer.c                |  873 ----
 drivers/isdn/hisax/sedlbauer_cs.c             |  209 -
 drivers/isdn/hisax/sportster.c                |  267 --
 drivers/isdn/hisax/st5481.h                   |  529 ---
 drivers/isdn/hisax/st5481_b.c                 |  380 --
 drivers/isdn/hisax/st5481_d.c                 |  780 ----
 drivers/isdn/hisax/st5481_init.c              |  221 -
 drivers/isdn/hisax/st5481_usb.c               |  659 ---
 drivers/isdn/hisax/tei.c                      |  465 --
 drivers/isdn/hisax/teleint.c                  |  334 --
 drivers/isdn/hisax/teles0.c                   |  364 --
 drivers/isdn/hisax/teles3.c                   |  498 ---
 drivers/isdn/hisax/teles_cs.c                 |  200 -
 drivers/isdn/hisax/telespci.c                 |  349 --
 drivers/isdn/hisax/w6692.c                    | 1085 -----
 drivers/isdn/hisax/w6692.h                    |  184 -
 drivers/isdn/i4l/Kconfig                      |  128 -
 drivers/isdn/i4l/Makefile                     |   20 -
 drivers/isdn/i4l/isdn_audio.c                 |  711 ----
 drivers/isdn/i4l/isdn_audio.h                 |   44 -
 drivers/isdn/i4l/isdn_bsdcomp.c               |  930 ----
 drivers/isdn/i4l/isdn_common.c                | 2368 -----------
 drivers/isdn/i4l/isdn_common.h                |   47 -
 drivers/isdn/i4l/isdn_concap.c                |   99 -
 drivers/isdn/i4l/isdn_concap.h                |   11 -
 drivers/isdn/i4l/isdn_net.c                   | 3198 --------------
 drivers/isdn/i4l/isdn_net.h                   |  151 -
 drivers/isdn/i4l/isdn_ppp.c                   | 3046 -------------
 drivers/isdn/i4l/isdn_ppp.h                   |   41 -
 drivers/isdn/i4l/isdn_tty.c                   | 3756 -----------------
 drivers/isdn/i4l/isdn_tty.h                   |  120 -
 drivers/isdn/i4l/isdn_ttyfax.c                | 1123 -----
 drivers/isdn/i4l/isdn_ttyfax.h                |   17 -
 drivers/isdn/i4l/isdn_v110.c                  |  625 ---
 drivers/isdn/i4l/isdn_v110.h                  |   29 -
 drivers/isdn/i4l/isdn_x25iface.c              |  332 --
 drivers/isdn/i4l/isdn_x25iface.h              |   30 -
 drivers/isdn/isdnloop/Makefile                |    5 -
 drivers/isdn/isdnloop/isdnloop.c              | 1528 -------
 drivers/isdn/isdnloop/isdnloop.h              |  112 -
 drivers/staging/Kconfig                       |    2 +
 drivers/staging/Makefile                      |    1 +
 drivers/staging/isdn/Kconfig                  |   11 +
 drivers/staging/isdn/Makefile                 |    8 +
 drivers/staging/isdn/TODO                     |   22 +
 .../hardware => staging/isdn}/avm/Kconfig     |    0
 .../hardware => staging/isdn}/avm/Makefile    |    0
 .../hardware => staging/isdn}/avm/avm_cs.c    |    0
 .../hardware => staging/isdn}/avm/avmcard.h   |    0
 .../{isdn/hardware => staging/isdn}/avm/b1.c  |    0
 .../hardware => staging/isdn}/avm/b1dma.c     |    0
 .../hardware => staging/isdn}/avm/b1isa.c     |    0
 .../hardware => staging/isdn}/avm/b1pci.c     |    0
 .../hardware => staging/isdn}/avm/b1pcmcia.c  |    0
 .../{isdn/hardware => staging/isdn}/avm/c4.c  |    0
 .../hardware => staging/isdn}/avm/t1isa.c     |    0
 .../hardware => staging/isdn}/avm/t1pci.c     |    0
 drivers/{ => staging}/isdn/gigaset/Kconfig    |   22 +-
 drivers/{ => staging}/isdn/gigaset/Makefile   |    5 +-
 .../{ => staging}/isdn/gigaset/asyncdata.c    |    0
 .../{ => staging}/isdn/gigaset/bas-gigaset.c  |    0
 drivers/{ => staging}/isdn/gigaset/capi.c     |    0
 drivers/{ => staging}/isdn/gigaset/common.c   |    0
 drivers/{ => staging}/isdn/gigaset/ev-layer.c |    0
 drivers/{ => staging}/isdn/gigaset/gigaset.h  |    0
 .../{ => staging}/isdn/gigaset/interface.c    |    0
 drivers/{ => staging}/isdn/gigaset/isocdata.c |    0
 drivers/{ => staging}/isdn/gigaset/proc.c     |    0
 .../{ => staging}/isdn/gigaset/ser-gigaset.c  |    0
 .../{ => staging}/isdn/gigaset/usb-gigaset.c  |    0
 drivers/{ => staging}/isdn/hysdn/Kconfig      |    0
 drivers/{ => staging}/isdn/hysdn/Makefile     |    0
 drivers/{ => staging}/isdn/hysdn/boardergo.c  |    0
 drivers/{ => staging}/isdn/hysdn/boardergo.h  |    0
 drivers/{ => staging}/isdn/hysdn/hycapi.c     |    0
 drivers/{ => staging}/isdn/hysdn/hysdn_boot.c |    0
 drivers/{ => staging}/isdn/hysdn/hysdn_defs.h |    0
 drivers/{ => staging}/isdn/hysdn/hysdn_init.c |    0
 drivers/{ => staging}/isdn/hysdn/hysdn_net.c  |    0
 drivers/{ => staging}/isdn/hysdn/hysdn_pof.h  |    0
 .../{ => staging}/isdn/hysdn/hysdn_procconf.c |    0
 .../{ => staging}/isdn/hysdn/hysdn_proclog.c  |    0
 .../{ => staging}/isdn/hysdn/hysdn_sched.c    |    0
 drivers/{ => staging}/isdn/hysdn/ince1pc.h    |    0
 include/linux/concap.h                        |  112 -
 include/linux/isdn.h                          |  473 ---
 include/linux/isdn_divertif.h                 |   35 -
 include/linux/isdn_ppp.h                      |  194 -
 include/linux/isdnif.h                        |  505 ---
 include/linux/wanrouter.h                     |   11 -
 include/uapi/linux/isdn.h                     |  144 -
 include/uapi/linux/isdn_divertif.h            |   31 -
 include/uapi/linux/isdn_ppp.h                 |   68 -
 include/uapi/linux/isdnif.h                   |   57 -
 include/uapi/linux/wanrouter.h                |   18 -
 216 files changed, 101 insertions(+), 83968 deletions(-)
 delete mode 100644 Documentation/isdn/HiSax.cert
 delete mode 100644 Documentation/isdn/INTERFACE
 delete mode 100644 Documentation/isdn/INTERFACE.fax
 delete mode 100644 Documentation/isdn/README
 delete mode 100644 Documentation/isdn/README.FAQ
 delete mode 100644 Documentation/isdn/README.HiSax
 delete mode 100644 Documentation/isdn/README.audio
 delete mode 100644 Documentation/isdn/README.concap
 delete mode 100644 Documentation/isdn/README.diversion
 delete mode 100644 Documentation/isdn/README.fax
 delete mode 100644 Documentation/isdn/README.hfc-pci
 delete mode 100644 Documentation/isdn/README.syncppp
 delete mode 100644 Documentation/isdn/README.x25
 delete mode 100644 Documentation/isdn/syncPPP.FAQ
 delete mode 100644 drivers/isdn/capi/capidrv.c
 delete mode 100644 drivers/isdn/capi/capidrv.h
 delete mode 100644 drivers/isdn/divert/Makefile
 delete mode 100644 drivers/isdn/divert/divert_init.c
 delete mode 100644 drivers/isdn/divert/divert_procfs.c
 delete mode 100644 drivers/isdn/divert/isdn_divert.c
 delete mode 100644 drivers/isdn/divert/isdn_divert.h
 delete mode 100644 drivers/isdn/gigaset/dummyll.c
 delete mode 100644 drivers/isdn/gigaset/i4l.c
 delete mode 100644 drivers/isdn/hardware/Kconfig
 rename drivers/isdn/{i4l => hardware/mISDN}/isdnhdlc.c (99%)
 rename include/linux/isdn/hdlc.h => drivers/isdn/hardware/mISDN/isdnhdlc.h (100%)
 delete mode 100644 drivers/isdn/hisax/Kconfig
 delete mode 100644 drivers/isdn/hisax/Makefile
 delete mode 100644 drivers/isdn/hisax/amd7930_fn.c
 delete mode 100644 drivers/isdn/hisax/amd7930_fn.h
 delete mode 100644 drivers/isdn/hisax/arcofi.c
 delete mode 100644 drivers/isdn/hisax/arcofi.h
 delete mode 100644 drivers/isdn/hisax/asuscom.c
 delete mode 100644 drivers/isdn/hisax/avm_a1.c
 delete mode 100644 drivers/isdn/hisax/avm_a1p.c
 delete mode 100644 drivers/isdn/hisax/avm_pci.c
 delete mode 100644 drivers/isdn/hisax/avma1_cs.c
 delete mode 100644 drivers/isdn/hisax/bkm_a4t.c
 delete mode 100644 drivers/isdn/hisax/bkm_a8.c
 delete mode 100644 drivers/isdn/hisax/bkm_ax.h
 delete mode 100644 drivers/isdn/hisax/callc.c
 delete mode 100644 drivers/isdn/hisax/config.c
 delete mode 100644 drivers/isdn/hisax/diva.c
 delete mode 100644 drivers/isdn/hisax/elsa.c
 delete mode 100644 drivers/isdn/hisax/elsa_cs.c
 delete mode 100644 drivers/isdn/hisax/elsa_ser.c
 delete mode 100644 drivers/isdn/hisax/enternow_pci.c
 delete mode 100644 drivers/isdn/hisax/fsm.c
 delete mode 100644 drivers/isdn/hisax/fsm.h
 delete mode 100644 drivers/isdn/hisax/gazel.c
 delete mode 100644 drivers/isdn/hisax/hfc4s8s_l1.c
 delete mode 100644 drivers/isdn/hisax/hfc4s8s_l1.h
 delete mode 100644 drivers/isdn/hisax/hfc_2bds0.c
 delete mode 100644 drivers/isdn/hisax/hfc_2bds0.h
 delete mode 100644 drivers/isdn/hisax/hfc_2bs0.c
 delete mode 100644 drivers/isdn/hisax/hfc_2bs0.h
 delete mode 100644 drivers/isdn/hisax/hfc_pci.c
 delete mode 100644 drivers/isdn/hisax/hfc_pci.h
 delete mode 100644 drivers/isdn/hisax/hfc_sx.c
 delete mode 100644 drivers/isdn/hisax/hfc_sx.h
 delete mode 100644 drivers/isdn/hisax/hfc_usb.c
 delete mode 100644 drivers/isdn/hisax/hfc_usb.h
 delete mode 100644 drivers/isdn/hisax/hfcscard.c
 delete mode 100644 drivers/isdn/hisax/hisax.h
 delete mode 100644 drivers/isdn/hisax/hisax_cfg.h
 delete mode 100644 drivers/isdn/hisax/hisax_debug.h
 delete mode 100644 drivers/isdn/hisax/hisax_fcpcipnp.c
 delete mode 100644 drivers/isdn/hisax/hisax_fcpcipnp.h
 delete mode 100644 drivers/isdn/hisax/hisax_if.h
 delete mode 100644 drivers/isdn/hisax/hisax_isac.c
 delete mode 100644 drivers/isdn/hisax/hisax_isac.h
 delete mode 100644 drivers/isdn/hisax/hscx.c
 delete mode 100644 drivers/isdn/hisax/hscx.h
 delete mode 100644 drivers/isdn/hisax/hscx_irq.c
 delete mode 100644 drivers/isdn/hisax/icc.c
 delete mode 100644 drivers/isdn/hisax/icc.h
 delete mode 100644 drivers/isdn/hisax/ipac.h
 delete mode 100644 drivers/isdn/hisax/ipacx.c
 delete mode 100644 drivers/isdn/hisax/ipacx.h
 delete mode 100644 drivers/isdn/hisax/isac.c
 delete mode 100644 drivers/isdn/hisax/isac.h
 delete mode 100644 drivers/isdn/hisax/isar.c
 delete mode 100644 drivers/isdn/hisax/isar.h
 delete mode 100644 drivers/isdn/hisax/isdnl1.c
 delete mode 100644 drivers/isdn/hisax/isdnl1.h
 delete mode 100644 drivers/isdn/hisax/isdnl2.c
 delete mode 100644 drivers/isdn/hisax/isdnl2.h
 delete mode 100644 drivers/isdn/hisax/isdnl3.c
 delete mode 100644 drivers/isdn/hisax/isdnl3.h
 delete mode 100644 drivers/isdn/hisax/isurf.c
 delete mode 100644 drivers/isdn/hisax/ix1_micro.c
 delete mode 100644 drivers/isdn/hisax/jade.c
 delete mode 100644 drivers/isdn/hisax/jade.h
 delete mode 100644 drivers/isdn/hisax/jade_irq.c
 delete mode 100644 drivers/isdn/hisax/l3_1tr6.c
 delete mode 100644 drivers/isdn/hisax/l3_1tr6.h
 delete mode 100644 drivers/isdn/hisax/l3dss1.c
 delete mode 100644 drivers/isdn/hisax/l3dss1.h
 delete mode 100644 drivers/isdn/hisax/l3ni1.c
 delete mode 100644 drivers/isdn/hisax/l3ni1.h
 delete mode 100644 drivers/isdn/hisax/lmgr.c
 delete mode 100644 drivers/isdn/hisax/mic.c
 delete mode 100644 drivers/isdn/hisax/netjet.c
 delete mode 100644 drivers/isdn/hisax/netjet.h
 delete mode 100644 drivers/isdn/hisax/niccy.c
 delete mode 100644 drivers/isdn/hisax/nj_s.c
 delete mode 100644 drivers/isdn/hisax/nj_u.c
 delete mode 100644 drivers/isdn/hisax/q931.c
 delete mode 100644 drivers/isdn/hisax/s0box.c
 delete mode 100644 drivers/isdn/hisax/saphir.c
 delete mode 100644 drivers/isdn/hisax/sedlbauer.c
 delete mode 100644 drivers/isdn/hisax/sedlbauer_cs.c
 delete mode 100644 drivers/isdn/hisax/sportster.c
 delete mode 100644 drivers/isdn/hisax/st5481.h
 delete mode 100644 drivers/isdn/hisax/st5481_b.c
 delete mode 100644 drivers/isdn/hisax/st5481_d.c
 delete mode 100644 drivers/isdn/hisax/st5481_init.c
 delete mode 100644 drivers/isdn/hisax/st5481_usb.c
 delete mode 100644 drivers/isdn/hisax/tei.c
 delete mode 100644 drivers/isdn/hisax/teleint.c
 delete mode 100644 drivers/isdn/hisax/teles0.c
 delete mode 100644 drivers/isdn/hisax/teles3.c
 delete mode 100644 drivers/isdn/hisax/teles_cs.c
 delete mode 100644 drivers/isdn/hisax/telespci.c
 delete mode 100644 drivers/isdn/hisax/w6692.c
 delete mode 100644 drivers/isdn/hisax/w6692.h
 delete mode 100644 drivers/isdn/i4l/Kconfig
 delete mode 100644 drivers/isdn/i4l/Makefile
 delete mode 100644 drivers/isdn/i4l/isdn_audio.c
 delete mode 100644 drivers/isdn/i4l/isdn_audio.h
 delete mode 100644 drivers/isdn/i4l/isdn_bsdcomp.c
 delete mode 100644 drivers/isdn/i4l/isdn_common.c
 delete mode 100644 drivers/isdn/i4l/isdn_common.h
 delete mode 100644 drivers/isdn/i4l/isdn_concap.c
 delete mode 100644 drivers/isdn/i4l/isdn_concap.h
 delete mode 100644 drivers/isdn/i4l/isdn_net.c
 delete mode 100644 drivers/isdn/i4l/isdn_net.h
 delete mode 100644 drivers/isdn/i4l/isdn_ppp.c
 delete mode 100644 drivers/isdn/i4l/isdn_ppp.h
 delete mode 100644 drivers/isdn/i4l/isdn_tty.c
 delete mode 100644 drivers/isdn/i4l/isdn_tty.h
 delete mode 100644 drivers/isdn/i4l/isdn_ttyfax.c
 delete mode 100644 drivers/isdn/i4l/isdn_ttyfax.h
 delete mode 100644 drivers/isdn/i4l/isdn_v110.c
 delete mode 100644 drivers/isdn/i4l/isdn_v110.h
 delete mode 100644 drivers/isdn/i4l/isdn_x25iface.c
 delete mode 100644 drivers/isdn/i4l/isdn_x25iface.h
 delete mode 100644 drivers/isdn/isdnloop/Makefile
 delete mode 100644 drivers/isdn/isdnloop/isdnloop.c
 delete mode 100644 drivers/isdn/isdnloop/isdnloop.h
 create mode 100644 drivers/staging/isdn/Kconfig
 create mode 100644 drivers/staging/isdn/Makefile
 create mode 100644 drivers/staging/isdn/TODO
 rename drivers/{isdn/hardware => staging/isdn}/avm/Kconfig (100%)
 rename drivers/{isdn/hardware => staging/isdn}/avm/Makefile (100%)
 rename drivers/{isdn/hardware => staging/isdn}/avm/avm_cs.c (100%)
 rename drivers/{isdn/hardware => staging/isdn}/avm/avmcard.h (100%)
 rename drivers/{isdn/hardware => staging/isdn}/avm/b1.c (100%)
 rename drivers/{isdn/hardware => staging/isdn}/avm/b1dma.c (100%)
 rename drivers/{isdn/hardware => staging/isdn}/avm/b1isa.c (100%)
 rename drivers/{isdn/hardware => staging/isdn}/avm/b1pci.c (100%)
 rename drivers/{isdn/hardware => staging/isdn}/avm/b1pcmcia.c (100%)
 rename drivers/{isdn/hardware => staging/isdn}/avm/c4.c (100%)
 rename drivers/{isdn/hardware => staging/isdn}/avm/t1isa.c (100%)
 rename drivers/{isdn/hardware => staging/isdn}/avm/t1pci.c (100%)
 rename drivers/{ => staging}/isdn/gigaset/Kconfig (72%)
 rename drivers/{ => staging}/isdn/gigaset/Makefile (62%)
 rename drivers/{ => staging}/isdn/gigaset/asyncdata.c (100%)
 rename drivers/{ => staging}/isdn/gigaset/bas-gigaset.c (100%)
 rename drivers/{ => staging}/isdn/gigaset/capi.c (100%)
 rename drivers/{ => staging}/isdn/gigaset/common.c (100%)
 rename drivers/{ => staging}/isdn/gigaset/ev-layer.c (100%)
 rename drivers/{ => staging}/isdn/gigaset/gigaset.h (100%)
 rename drivers/{ => staging}/isdn/gigaset/interface.c (100%)
 rename drivers/{ => staging}/isdn/gigaset/isocdata.c (100%)
 rename drivers/{ => staging}/isdn/gigaset/proc.c (100%)
 rename drivers/{ => staging}/isdn/gigaset/ser-gigaset.c (100%)
 rename drivers/{ => staging}/isdn/gigaset/usb-gigaset.c (100%)
 rename drivers/{ => staging}/isdn/hysdn/Kconfig (100%)
 rename drivers/{ => staging}/isdn/hysdn/Makefile (100%)
 rename drivers/{ => staging}/isdn/hysdn/boardergo.c (100%)
 rename drivers/{ => staging}/isdn/hysdn/boardergo.h (100%)
 rename drivers/{ => staging}/isdn/hysdn/hycapi.c (100%)
 rename drivers/{ => staging}/isdn/hysdn/hysdn_boot.c (100%)
 rename drivers/{ => staging}/isdn/hysdn/hysdn_defs.h (100%)
 rename drivers/{ => staging}/isdn/hysdn/hysdn_init.c (100%)
 rename drivers/{ => staging}/isdn/hysdn/hysdn_net.c (100%)
 rename drivers/{ => staging}/isdn/hysdn/hysdn_pof.h (100%)
 rename drivers/{ => staging}/isdn/hysdn/hysdn_procconf.c (100%)
 rename drivers/{ => staging}/isdn/hysdn/hysdn_proclog.c (100%)
 rename drivers/{ => staging}/isdn/hysdn/hysdn_sched.c (100%)
 rename drivers/{ => staging}/isdn/hysdn/ince1pc.h (100%)
 delete mode 100644 include/linux/concap.h
 delete mode 100644 include/linux/isdn.h
 delete mode 100644 include/linux/isdn_divertif.h
 delete mode 100644 include/linux/isdn_ppp.h
 delete mode 100644 include/linux/isdnif.h
 delete mode 100644 include/linux/wanrouter.h
 delete mode 100644 include/uapi/linux/isdn.h
 delete mode 100644 include/uapi/linux/isdn_divertif.h
 delete mode 100644 include/uapi/linux/isdn_ppp.h
 delete mode 100644 include/uapi/linux/isdnif.h
 delete mode 100644 include/uapi/linux/wanrouter.h

-- 
2.20.0


^ permalink raw reply	[flat|nested] 12+ messages in thread

* [PATCH v2 1/5] isdn: gigaset: remove i4l support
  2019-04-26 19:58 [PATCH v2 0/5] isdn: deprecate non-mISDN drivers Arnd Bergmann
@ 2019-04-26 19:58 ` Arnd Bergmann
  2019-04-28  2:04   ` David Miller
  2019-04-26 19:58 ` [PATCH v2 2/5] isdn: remove hisax driver Arnd Bergmann
                   ` (3 subsequent siblings)
  4 siblings, 1 reply; 12+ messages in thread
From: Arnd Bergmann @ 2019-04-26 19:58 UTC (permalink / raw)
  To: netdev
  Cc: isdn4linux, Karsten Keil, Paul Bolle, Holger Schurig,
	Tilman Schmidt, Al Viro, gigaset307x-common, arnd,
	Thomas Jarosch, Birger Harzenetter

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      |   9 -
 drivers/isdn/gigaset/Makefile     |  10 +-
 drivers/isdn/gigaset/i4l.c        | 695 ------------------------------
 4 files changed, 15 insertions(+), 735 deletions(-)
 delete mode 100644 drivers/isdn/gigaset/i4l.c

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..395df5ffb6b0 100644
--- a/drivers/isdn/gigaset/Kconfig
+++ b/drivers/isdn/gigaset/Kconfig
@@ -29,15 +29,6 @@ config GIGASET_CAPI
 	  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..9c010891dcd7 100644
--- a/drivers/isdn/gigaset/Makefile
+++ b/drivers/isdn/gigaset/Makefile
@@ -1,8 +1,12 @@
 # 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
+
+ifdef CONFIG_GIGASET_CAPI
+gigaset-y += capi.o
+else
+gigaset-y += dummyll.o
+endif
+
 usb_gigaset-y := usb-gigaset.o
 ser_gigaset-y := ser-gigaset.o
 bas_gigaset-y := bas-gigaset.o isocdata.o
diff --git a/drivers/isdn/gigaset/i4l.c b/drivers/isdn/gigaset/i4l.c
deleted file mode 100644
index b5b389e95edd..000000000000
-- 
2.20.0


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [PATCH v2 2/5] isdn: remove hisax driver
  2019-04-26 19:58 [PATCH v2 0/5] isdn: deprecate non-mISDN drivers Arnd Bergmann
  2019-04-26 19:58 ` [PATCH v2 1/5] isdn: gigaset: remove i4l support Arnd Bergmann
@ 2019-04-26 19:58 ` Arnd Bergmann
  2019-04-26 19:58 ` [PATCH v2 3/5] isdn: remove isdn4linux Arnd Bergmann
                   ` (2 subsequent siblings)
  4 siblings, 0 replies; 12+ messages in thread
From: Arnd Bergmann @ 2019-04-26 19:58 UTC (permalink / raw)
  To: netdev
  Cc: isdn4linux, Karsten Keil, Paul Bolle, Holger Schurig,
	Tilman Schmidt, Al Viro, gigaset307x-common, arnd,
	Thomas Jarosch, Birger Harzenetter

With the decline of ISDN, this seems to have become almost completely
obsolete, and even in the past years before that, almost all remaining
users appear to have used mISDN instead.

Birger Harzenetter noted that he is still using i4l/hisax to take
advantage of the 'divert' driver for call diversion, but otherwise uses
mISDN on the same hardware. This is a rare edge case as far as I
can tell, but we are still breaking an actively used work flow
(see https://xkcd.com/1172/).

We debated moving i4l/hisax to staging as an intermediate step, but as
he is not likely to change the setup, and that would just delay breaking
this use case.  The alternatives here are to stay on stable kernels
< 5.2, to create an external driver repository for isdn4linux, or to
add divert functionality to mISDN.

Cc: Birger Harzenetter <WIMPy@yeti.dk>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 Documentation/isdn/HiSax.cert       |   96 -
 Documentation/isdn/README.HiSax     |  659 ------
 drivers/isdn/Makefile               |    1 -
 drivers/isdn/hisax/Kconfig          |  422 ----
 drivers/isdn/hisax/Makefile         |   60 -
 drivers/isdn/hisax/amd7930_fn.c     |  794 -------
 drivers/isdn/hisax/amd7930_fn.h     |   37 -
 drivers/isdn/hisax/arcofi.c         |  131 --
 drivers/isdn/hisax/arcofi.h         |   27 -
 drivers/isdn/hisax/asuscom.c        |  423 ----
 drivers/isdn/hisax/avm_a1.c         |  307 ---
 drivers/isdn/hisax/avm_a1p.c        |  267 ---
 drivers/isdn/hisax/avm_pci.c        |  904 --------
 drivers/isdn/hisax/avma1_cs.c       |  162 --
 drivers/isdn/hisax/bkm_a4t.c        |  358 ---
 drivers/isdn/hisax/bkm_a8.c         |  433 ----
 drivers/isdn/hisax/bkm_ax.h         |  119 -
 drivers/isdn/hisax/callc.c          | 1792 ---------------
 drivers/isdn/hisax/config.c         | 1993 -----------------
 drivers/isdn/hisax/diva.c           | 1282 -----------
 drivers/isdn/hisax/elsa.c           | 1245 -----------
 drivers/isdn/hisax/elsa_cs.c        |  218 --
 drivers/isdn/hisax/elsa_ser.c       |  659 ------
 drivers/isdn/hisax/enternow_pci.c   |  420 ----
 drivers/isdn/hisax/fsm.c            |  161 --
 drivers/isdn/hisax/fsm.h            |   61 -
 drivers/isdn/hisax/gazel.c          |  691 ------
 drivers/isdn/hisax/hfc4s8s_l1.c     | 1584 -------------
 drivers/isdn/hisax/hfc4s8s_l1.h     |   89 -
 drivers/isdn/hisax/hfc_2bds0.c      | 1078 ---------
 drivers/isdn/hisax/hfc_2bds0.h      |  128 --
 drivers/isdn/hisax/hfc_2bs0.c       |  591 -----
 drivers/isdn/hisax/hfc_2bs0.h       |   60 -
 drivers/isdn/hisax/hfc_pci.c        | 1755 ---------------
 drivers/isdn/hisax/hfc_pci.h        |  235 --
 drivers/isdn/hisax/hfc_sx.c         | 1517 -------------
 drivers/isdn/hisax/hfc_sx.h         |  196 --
 drivers/isdn/hisax/hfc_usb.c        | 1608 -------------
 drivers/isdn/hisax/hfc_usb.h        |  208 --
 drivers/isdn/hisax/hfcscard.c       |  261 ---
 drivers/isdn/hisax/hisax.h          | 1352 -----------
 drivers/isdn/hisax/hisax_cfg.h      |   66 -
 drivers/isdn/hisax/hisax_debug.h    |   80 -
 drivers/isdn/hisax/hisax_fcpcipnp.c | 1024 ---------
 drivers/isdn/hisax/hisax_fcpcipnp.h |   58 -
 drivers/isdn/hisax/hisax_if.h       |   66 -
 drivers/isdn/hisax/hisax_isac.c     |  895 --------
 drivers/isdn/hisax/hisax_isac.h     |   46 -
 drivers/isdn/hisax/hscx.c           |  277 ---
 drivers/isdn/hisax/hscx.h           |   41 -
 drivers/isdn/hisax/hscx_irq.c       |  294 ---
 drivers/isdn/hisax/icc.c            |  680 ------
 drivers/isdn/hisax/icc.h            |   72 -
 drivers/isdn/hisax/ipac.h           |   29 -
 drivers/isdn/hisax/ipacx.c          |  913 --------
 drivers/isdn/hisax/ipacx.h          |  162 --
 drivers/isdn/hisax/isac.c           |  681 ------
 drivers/isdn/hisax/isac.h           |   70 -
 drivers/isdn/hisax/isar.c           | 1910 ----------------
 drivers/isdn/hisax/isar.h           |  222 --
 drivers/isdn/hisax/isdnl1.c         |  930 --------
 drivers/isdn/hisax/isdnl1.h         |   32 -
 drivers/isdn/hisax/isdnl2.c         | 1839 ---------------
 drivers/isdn/hisax/isdnl2.h         |   25 -
 drivers/isdn/hisax/isdnl3.c         |  594 -----
 drivers/isdn/hisax/isdnl3.h         |   42 -
 drivers/isdn/hisax/isurf.c          |  305 ---
 drivers/isdn/hisax/ix1_micro.c      |  316 ---
 drivers/isdn/hisax/jade.c           |  305 ---
 drivers/isdn/hisax/jade.h           |  134 --
 drivers/isdn/hisax/jade_irq.c       |  238 --
 drivers/isdn/hisax/l3_1tr6.c        |  932 --------
 drivers/isdn/hisax/l3_1tr6.h        |  164 --
 drivers/isdn/hisax/l3dss1.c         | 3227 ---------------------------
 drivers/isdn/hisax/l3dss1.h         |  124 -
 drivers/isdn/hisax/l3ni1.c          | 3182 --------------------------
 drivers/isdn/hisax/l3ni1.h          |  136 --
 drivers/isdn/hisax/lmgr.c           |   50 -
 drivers/isdn/hisax/mic.c            |  235 --
 drivers/isdn/hisax/netjet.c         |  985 --------
 drivers/isdn/hisax/netjet.h         |   69 -
 drivers/isdn/hisax/niccy.c          |  380 ----
 drivers/isdn/hisax/nj_s.c           |  294 ---
 drivers/isdn/hisax/nj_u.c           |  258 ---
 drivers/isdn/hisax/q931.c           | 1513 -------------
 drivers/isdn/hisax/s0box.c          |  260 ---
 drivers/isdn/hisax/saphir.c         |  296 ---
 drivers/isdn/hisax/sedlbauer.c      |  873 --------
 drivers/isdn/hisax/sedlbauer_cs.c   |  209 --
 drivers/isdn/hisax/sportster.c      |  267 ---
 drivers/isdn/hisax/st5481.h         |  529 -----
 drivers/isdn/hisax/st5481_b.c       |  380 ----
 drivers/isdn/hisax/st5481_d.c       |  780 -------
 drivers/isdn/hisax/st5481_init.c    |  221 --
 drivers/isdn/hisax/st5481_usb.c     |  659 ------
 drivers/isdn/hisax/tei.c            |  465 ----
 drivers/isdn/hisax/teleint.c        |  334 ---
 drivers/isdn/hisax/teles0.c         |  364 ---
 drivers/isdn/hisax/teles3.c         |  498 -----
 drivers/isdn/hisax/teles_cs.c       |  200 --
 drivers/isdn/hisax/telespci.c       |  349 ---
 drivers/isdn/hisax/w6692.c          | 1085 ---------
 drivers/isdn/hisax/w6692.h          |  184 --
 drivers/isdn/i4l/Kconfig            |    2 -
 104 files changed, 56234 deletions(-)
 delete mode 100644 Documentation/isdn/HiSax.cert
 delete mode 100644 Documentation/isdn/README.HiSax
 delete mode 100644 drivers/isdn/hisax/Kconfig
 delete mode 100644 drivers/isdn/hisax/Makefile
 delete mode 100644 drivers/isdn/hisax/amd7930_fn.c
 delete mode 100644 drivers/isdn/hisax/amd7930_fn.h
 delete mode 100644 drivers/isdn/hisax/arcofi.c
 delete mode 100644 drivers/isdn/hisax/arcofi.h
 delete mode 100644 drivers/isdn/hisax/asuscom.c
 delete mode 100644 drivers/isdn/hisax/avm_a1.c
 delete mode 100644 drivers/isdn/hisax/avm_a1p.c
 delete mode 100644 drivers/isdn/hisax/avm_pci.c
 delete mode 100644 drivers/isdn/hisax/avma1_cs.c
 delete mode 100644 drivers/isdn/hisax/bkm_a4t.c
 delete mode 100644 drivers/isdn/hisax/bkm_a8.c
 delete mode 100644 drivers/isdn/hisax/bkm_ax.h
 delete mode 100644 drivers/isdn/hisax/callc.c
 delete mode 100644 drivers/isdn/hisax/config.c
 delete mode 100644 drivers/isdn/hisax/diva.c
 delete mode 100644 drivers/isdn/hisax/elsa.c
 delete mode 100644 drivers/isdn/hisax/elsa_cs.c
 delete mode 100644 drivers/isdn/hisax/elsa_ser.c
 delete mode 100644 drivers/isdn/hisax/enternow_pci.c
 delete mode 100644 drivers/isdn/hisax/fsm.c
 delete mode 100644 drivers/isdn/hisax/fsm.h
 delete mode 100644 drivers/isdn/hisax/gazel.c
 delete mode 100644 drivers/isdn/hisax/hfc4s8s_l1.c
 delete mode 100644 drivers/isdn/hisax/hfc4s8s_l1.h
 delete mode 100644 drivers/isdn/hisax/hfc_2bds0.c
 delete mode 100644 drivers/isdn/hisax/hfc_2bds0.h
 delete mode 100644 drivers/isdn/hisax/hfc_2bs0.c
 delete mode 100644 drivers/isdn/hisax/hfc_2bs0.h
 delete mode 100644 drivers/isdn/hisax/hfc_pci.c
 delete mode 100644 drivers/isdn/hisax/hfc_pci.h
 delete mode 100644 drivers/isdn/hisax/hfc_sx.c
 delete mode 100644 drivers/isdn/hisax/hfc_sx.h
 delete mode 100644 drivers/isdn/hisax/hfc_usb.c
 delete mode 100644 drivers/isdn/hisax/hfc_usb.h
 delete mode 100644 drivers/isdn/hisax/hfcscard.c
 delete mode 100644 drivers/isdn/hisax/hisax.h
 delete mode 100644 drivers/isdn/hisax/hisax_cfg.h
 delete mode 100644 drivers/isdn/hisax/hisax_debug.h
 delete mode 100644 drivers/isdn/hisax/hisax_fcpcipnp.c
 delete mode 100644 drivers/isdn/hisax/hisax_fcpcipnp.h
 delete mode 100644 drivers/isdn/hisax/hisax_if.h
 delete mode 100644 drivers/isdn/hisax/hisax_isac.c
 delete mode 100644 drivers/isdn/hisax/hisax_isac.h
 delete mode 100644 drivers/isdn/hisax/hscx.c
 delete mode 100644 drivers/isdn/hisax/hscx.h
 delete mode 100644 drivers/isdn/hisax/hscx_irq.c
 delete mode 100644 drivers/isdn/hisax/icc.c
 delete mode 100644 drivers/isdn/hisax/icc.h
 delete mode 100644 drivers/isdn/hisax/ipac.h
 delete mode 100644 drivers/isdn/hisax/ipacx.c
 delete mode 100644 drivers/isdn/hisax/ipacx.h
 delete mode 100644 drivers/isdn/hisax/isac.c
 delete mode 100644 drivers/isdn/hisax/isac.h
 delete mode 100644 drivers/isdn/hisax/isar.c
 delete mode 100644 drivers/isdn/hisax/isar.h
 delete mode 100644 drivers/isdn/hisax/isdnl1.c
 delete mode 100644 drivers/isdn/hisax/isdnl1.h
 delete mode 100644 drivers/isdn/hisax/isdnl2.c
 delete mode 100644 drivers/isdn/hisax/isdnl2.h
 delete mode 100644 drivers/isdn/hisax/isdnl3.c
 delete mode 100644 drivers/isdn/hisax/isdnl3.h
 delete mode 100644 drivers/isdn/hisax/isurf.c
 delete mode 100644 drivers/isdn/hisax/ix1_micro.c
 delete mode 100644 drivers/isdn/hisax/jade.c
 delete mode 100644 drivers/isdn/hisax/jade.h
 delete mode 100644 drivers/isdn/hisax/jade_irq.c
 delete mode 100644 drivers/isdn/hisax/l3_1tr6.c
 delete mode 100644 drivers/isdn/hisax/l3_1tr6.h
 delete mode 100644 drivers/isdn/hisax/l3dss1.c
 delete mode 100644 drivers/isdn/hisax/l3dss1.h
 delete mode 100644 drivers/isdn/hisax/l3ni1.c
 delete mode 100644 drivers/isdn/hisax/l3ni1.h
 delete mode 100644 drivers/isdn/hisax/lmgr.c
 delete mode 100644 drivers/isdn/hisax/mic.c
 delete mode 100644 drivers/isdn/hisax/netjet.c
 delete mode 100644 drivers/isdn/hisax/netjet.h
 delete mode 100644 drivers/isdn/hisax/niccy.c
 delete mode 100644 drivers/isdn/hisax/nj_s.c
 delete mode 100644 drivers/isdn/hisax/nj_u.c
 delete mode 100644 drivers/isdn/hisax/q931.c
 delete mode 100644 drivers/isdn/hisax/s0box.c
 delete mode 100644 drivers/isdn/hisax/saphir.c
 delete mode 100644 drivers/isdn/hisax/sedlbauer.c
 delete mode 100644 drivers/isdn/hisax/sedlbauer_cs.c
 delete mode 100644 drivers/isdn/hisax/sportster.c
 delete mode 100644 drivers/isdn/hisax/st5481.h
 delete mode 100644 drivers/isdn/hisax/st5481_b.c
 delete mode 100644 drivers/isdn/hisax/st5481_d.c
 delete mode 100644 drivers/isdn/hisax/st5481_init.c
 delete mode 100644 drivers/isdn/hisax/st5481_usb.c
 delete mode 100644 drivers/isdn/hisax/tei.c
 delete mode 100644 drivers/isdn/hisax/teleint.c
 delete mode 100644 drivers/isdn/hisax/teles0.c
 delete mode 100644 drivers/isdn/hisax/teles3.c
 delete mode 100644 drivers/isdn/hisax/teles_cs.c
 delete mode 100644 drivers/isdn/hisax/telespci.c
 delete mode 100644 drivers/isdn/hisax/w6692.c
 delete mode 100644 drivers/isdn/hisax/w6692.h

diff --git a/Documentation/isdn/HiSax.cert b/Documentation/isdn/HiSax.cert
deleted file mode 100644
index f2a6fcb8efee..000000000000
diff --git a/Documentation/isdn/README.HiSax b/Documentation/isdn/README.HiSax
deleted file mode 100644
index b1a573cf4472..000000000000
diff --git a/drivers/isdn/Makefile b/drivers/isdn/Makefile
index e7d3d8f2ad5a..7487f0bbe855 100644
--- a/drivers/isdn/Makefile
+++ b/drivers/isdn/Makefile
@@ -8,7 +8,6 @@ obj-$(CONFIG_ISDN_CAPI)			+= capi/
 obj-$(CONFIG_MISDN)			+= mISDN/
 obj-$(CONFIG_ISDN)			+= hardware/
 obj-$(CONFIG_ISDN_DIVERSION)		+= divert/
-obj-$(CONFIG_ISDN_DRV_HISAX)		+= hisax/
 obj-$(CONFIG_ISDN_DRV_LOOP)		+= isdnloop/
 obj-$(CONFIG_HYSDN)			+= hysdn/
 obj-$(CONFIG_ISDN_DRV_GIGASET)		+= gigaset/
diff --git a/drivers/isdn/hisax/Kconfig b/drivers/isdn/hisax/Kconfig
deleted file mode 100644
index 38cfc8baae19..000000000000
diff --git a/drivers/isdn/hisax/Makefile b/drivers/isdn/hisax/Makefile
deleted file mode 100644
index 3eca9d23f1c2..000000000000
diff --git a/drivers/isdn/hisax/amd7930_fn.c b/drivers/isdn/hisax/amd7930_fn.c
deleted file mode 100644
index 6c336366128c..000000000000
diff --git a/drivers/isdn/hisax/amd7930_fn.h b/drivers/isdn/hisax/amd7930_fn.h
deleted file mode 100644
index 1f4d80c5e5a6..000000000000
diff --git a/drivers/isdn/hisax/arcofi.c b/drivers/isdn/hisax/arcofi.c
deleted file mode 100644
index 2f784f96d439..000000000000
diff --git a/drivers/isdn/hisax/arcofi.h b/drivers/isdn/hisax/arcofi.h
deleted file mode 100644
index b9c77529fabf..000000000000
diff --git a/drivers/isdn/hisax/asuscom.c b/drivers/isdn/hisax/asuscom.c
deleted file mode 100644
index 74c871495e81..000000000000
diff --git a/drivers/isdn/hisax/avm_a1.c b/drivers/isdn/hisax/avm_a1.c
deleted file mode 100644
index 7dd74087ad72..000000000000
diff --git a/drivers/isdn/hisax/avm_a1p.c b/drivers/isdn/hisax/avm_a1p.c
deleted file mode 100644
index bc52d54ff5e1..000000000000
diff --git a/drivers/isdn/hisax/avm_pci.c b/drivers/isdn/hisax/avm_pci.c
deleted file mode 100644
index b161456c942e..000000000000
diff --git a/drivers/isdn/hisax/avma1_cs.c b/drivers/isdn/hisax/avma1_cs.c
deleted file mode 100644
index baad94ec1f4a..000000000000
diff --git a/drivers/isdn/hisax/bkm_a4t.c b/drivers/isdn/hisax/bkm_a4t.c
deleted file mode 100644
index c360164bde1b..000000000000
diff --git a/drivers/isdn/hisax/bkm_a8.c b/drivers/isdn/hisax/bkm_a8.c
deleted file mode 100644
index dd663ea57ec6..000000000000
diff --git a/drivers/isdn/hisax/bkm_ax.h b/drivers/isdn/hisax/bkm_ax.h
deleted file mode 100644
index 27ff8a88679b..000000000000
diff --git a/drivers/isdn/hisax/callc.c b/drivers/isdn/hisax/callc.c
deleted file mode 100644
index 9ee06328784c..000000000000
diff --git a/drivers/isdn/hisax/config.c b/drivers/isdn/hisax/config.c
deleted file mode 100644
index de965115a183..000000000000
diff --git a/drivers/isdn/hisax/diva.c b/drivers/isdn/hisax/diva.c
deleted file mode 100644
index d23df7a7784d..000000000000
diff --git a/drivers/isdn/hisax/elsa.c b/drivers/isdn/hisax/elsa.c
deleted file mode 100644
index 0754c0743790..000000000000
diff --git a/drivers/isdn/hisax/elsa_cs.c b/drivers/isdn/hisax/elsa_cs.c
deleted file mode 100644
index 40f6fad79de3..000000000000
diff --git a/drivers/isdn/hisax/elsa_ser.c b/drivers/isdn/hisax/elsa_ser.c
deleted file mode 100644
index 999effd7a276..000000000000
diff --git a/drivers/isdn/hisax/enternow_pci.c b/drivers/isdn/hisax/enternow_pci.c
deleted file mode 100644
index e8d431a8302d..000000000000
diff --git a/drivers/isdn/hisax/fsm.c b/drivers/isdn/hisax/fsm.c
deleted file mode 100644
index 80ba82f77c63..000000000000
diff --git a/drivers/isdn/hisax/fsm.h b/drivers/isdn/hisax/fsm.h
deleted file mode 100644
index 8c7385619a46..000000000000
diff --git a/drivers/isdn/hisax/gazel.c b/drivers/isdn/hisax/gazel.c
deleted file mode 100644
index a6d8af02354a..000000000000
diff --git a/drivers/isdn/hisax/hfc4s8s_l1.c b/drivers/isdn/hisax/hfc4s8s_l1.c
deleted file mode 100644
index e9bb8fb67ad0..000000000000
diff --git a/drivers/isdn/hisax/hfc4s8s_l1.h b/drivers/isdn/hisax/hfc4s8s_l1.h
deleted file mode 100644
index 4665b9d5df16..000000000000
diff --git a/drivers/isdn/hisax/hfc_2bds0.c b/drivers/isdn/hisax/hfc_2bds0.c
deleted file mode 100644
index 3715fa0343db..000000000000
diff --git a/drivers/isdn/hisax/hfc_2bds0.h b/drivers/isdn/hisax/hfc_2bds0.h
deleted file mode 100644
index 8c7582a3c51e..000000000000
diff --git a/drivers/isdn/hisax/hfc_2bs0.c b/drivers/isdn/hisax/hfc_2bs0.c
deleted file mode 100644
index 34d59992839a..000000000000
diff --git a/drivers/isdn/hisax/hfc_2bs0.h b/drivers/isdn/hisax/hfc_2bs0.h
deleted file mode 100644
index 1510096363dc..000000000000
diff --git a/drivers/isdn/hisax/hfc_pci.c b/drivers/isdn/hisax/hfc_pci.c
deleted file mode 100644
index 71a8312592d6..000000000000
diff --git a/drivers/isdn/hisax/hfc_pci.h b/drivers/isdn/hisax/hfc_pci.h
deleted file mode 100644
index 4c3b3ba35726..000000000000
diff --git a/drivers/isdn/hisax/hfc_sx.c b/drivers/isdn/hisax/hfc_sx.c
deleted file mode 100644
index 12af628d9b2c..000000000000
diff --git a/drivers/isdn/hisax/hfc_sx.h b/drivers/isdn/hisax/hfc_sx.h
deleted file mode 100644
index eee85dbb0883..000000000000
diff --git a/drivers/isdn/hisax/hfc_usb.c b/drivers/isdn/hisax/hfc_usb.c
deleted file mode 100644
index 1d4cd01d4685..000000000000
diff --git a/drivers/isdn/hisax/hfc_usb.h b/drivers/isdn/hisax/hfc_usb.h
deleted file mode 100644
index 9a212330e8a8..000000000000
diff --git a/drivers/isdn/hisax/hfcscard.c b/drivers/isdn/hisax/hfcscard.c
deleted file mode 100644
index 91b5219499ca..000000000000
diff --git a/drivers/isdn/hisax/hisax.h b/drivers/isdn/hisax/hisax.h
deleted file mode 100644
index 40080e06421c..000000000000
diff --git a/drivers/isdn/hisax/hisax_cfg.h b/drivers/isdn/hisax/hisax_cfg.h
deleted file mode 100644
index 487dcfe9e718..000000000000
diff --git a/drivers/isdn/hisax/hisax_debug.h b/drivers/isdn/hisax/hisax_debug.h
deleted file mode 100644
index 7b3093d0856a..000000000000
diff --git a/drivers/isdn/hisax/hisax_fcpcipnp.c b/drivers/isdn/hisax/hisax_fcpcipnp.c
deleted file mode 100644
index 7a7137d8664b..000000000000
diff --git a/drivers/isdn/hisax/hisax_fcpcipnp.h b/drivers/isdn/hisax/hisax_fcpcipnp.h
deleted file mode 100644
index 1f64e9937aa1..000000000000
diff --git a/drivers/isdn/hisax/hisax_if.h b/drivers/isdn/hisax/hisax_if.h
deleted file mode 100644
index 7098d6bd5ff2..000000000000
diff --git a/drivers/isdn/hisax/hisax_isac.c b/drivers/isdn/hisax/hisax_isac.c
deleted file mode 100644
index 0f36375478c5..000000000000
diff --git a/drivers/isdn/hisax/hisax_isac.h b/drivers/isdn/hisax/hisax_isac.h
deleted file mode 100644
index d7301da97991..000000000000
diff --git a/drivers/isdn/hisax/hscx.c b/drivers/isdn/hisax/hscx.c
deleted file mode 100644
index 3e305fec0ed9..000000000000
diff --git a/drivers/isdn/hisax/hscx.h b/drivers/isdn/hisax/hscx.h
deleted file mode 100644
index 1148b4bbe711..000000000000
diff --git a/drivers/isdn/hisax/hscx_irq.c b/drivers/isdn/hisax/hscx_irq.c
deleted file mode 100644
index 0d7e783c8bef..000000000000
diff --git a/drivers/isdn/hisax/icc.c b/drivers/isdn/hisax/icc.c
deleted file mode 100644
index 831dd1bb81ef..000000000000
diff --git a/drivers/isdn/hisax/icc.h b/drivers/isdn/hisax/icc.h
deleted file mode 100644
index f367df5d3669..000000000000
diff --git a/drivers/isdn/hisax/ipac.h b/drivers/isdn/hisax/ipac.h
deleted file mode 100644
index 4f937f02ee34..000000000000
diff --git a/drivers/isdn/hisax/ipacx.c b/drivers/isdn/hisax/ipacx.c
deleted file mode 100644
index c7086c1534bd..000000000000
diff --git a/drivers/isdn/hisax/ipacx.h b/drivers/isdn/hisax/ipacx.h
deleted file mode 100644
index e8a22e8f34b6..000000000000
diff --git a/drivers/isdn/hisax/isac.c b/drivers/isdn/hisax/isac.c
deleted file mode 100644
index bd40e0671ded..000000000000
diff --git a/drivers/isdn/hisax/isac.h b/drivers/isdn/hisax/isac.h
deleted file mode 100644
index 04f16b91b822..000000000000
diff --git a/drivers/isdn/hisax/isar.c b/drivers/isdn/hisax/isar.c
deleted file mode 100644
index 82c1879f5664..000000000000
diff --git a/drivers/isdn/hisax/isar.h b/drivers/isdn/hisax/isar.h
deleted file mode 100644
index 0f4d101faf37..000000000000
diff --git a/drivers/isdn/hisax/isdnl1.c b/drivers/isdn/hisax/isdnl1.c
deleted file mode 100644
index a560842c0e48..000000000000
diff --git a/drivers/isdn/hisax/isdnl1.h b/drivers/isdn/hisax/isdnl1.h
deleted file mode 100644
index 66ddcab19bba..000000000000
diff --git a/drivers/isdn/hisax/isdnl2.c b/drivers/isdn/hisax/isdnl2.c
deleted file mode 100644
index 1a40ed04cb52..000000000000
diff --git a/drivers/isdn/hisax/isdnl2.h b/drivers/isdn/hisax/isdnl2.h
deleted file mode 100644
index 7e447fb8ed1d..000000000000
diff --git a/drivers/isdn/hisax/isdnl3.c b/drivers/isdn/hisax/isdnl3.c
deleted file mode 100644
index bb3f9ec62749..000000000000
diff --git a/drivers/isdn/hisax/isdnl3.h b/drivers/isdn/hisax/isdnl3.h
deleted file mode 100644
index 0edc99d40dc2..000000000000
diff --git a/drivers/isdn/hisax/isurf.c b/drivers/isdn/hisax/isurf.c
deleted file mode 100644
index 53e299be4304..000000000000
diff --git a/drivers/isdn/hisax/ix1_micro.c b/drivers/isdn/hisax/ix1_micro.c
deleted file mode 100644
index bfb79f3f0a49..000000000000
diff --git a/drivers/isdn/hisax/jade.c b/drivers/isdn/hisax/jade.c
deleted file mode 100644
index e2ae7871a209..000000000000
diff --git a/drivers/isdn/hisax/jade.h b/drivers/isdn/hisax/jade.h
deleted file mode 100644
index 4b98096a5858..000000000000
diff --git a/drivers/isdn/hisax/jade_irq.c b/drivers/isdn/hisax/jade_irq.c
deleted file mode 100644
index a89e2df911c5..000000000000
diff --git a/drivers/isdn/hisax/l3_1tr6.c b/drivers/isdn/hisax/l3_1tr6.c
deleted file mode 100644
index 98f60d1523f4..000000000000
diff --git a/drivers/isdn/hisax/l3_1tr6.h b/drivers/isdn/hisax/l3_1tr6.h
deleted file mode 100644
index 43215c00cada..000000000000
diff --git a/drivers/isdn/hisax/l3dss1.c b/drivers/isdn/hisax/l3dss1.c
deleted file mode 100644
index 368d152a8f1d..000000000000
diff --git a/drivers/isdn/hisax/l3dss1.h b/drivers/isdn/hisax/l3dss1.h
deleted file mode 100644
index a7807e8a94f1..000000000000
diff --git a/drivers/isdn/hisax/l3ni1.c b/drivers/isdn/hisax/l3ni1.c
deleted file mode 100644
index ea311e7df48e..000000000000
diff --git a/drivers/isdn/hisax/l3ni1.h b/drivers/isdn/hisax/l3ni1.h
deleted file mode 100644
index 99d37d2cea4f..000000000000
diff --git a/drivers/isdn/hisax/lmgr.c b/drivers/isdn/hisax/lmgr.c
deleted file mode 100644
index 5b63eb6601aa..000000000000
diff --git a/drivers/isdn/hisax/mic.c b/drivers/isdn/hisax/mic.c
deleted file mode 100644
index 93398676f78f..000000000000
diff --git a/drivers/isdn/hisax/netjet.c b/drivers/isdn/hisax/netjet.c
deleted file mode 100644
index d7b011c8d692..000000000000
diff --git a/drivers/isdn/hisax/netjet.h b/drivers/isdn/hisax/netjet.h
deleted file mode 100644
index 70590d5d5e64..000000000000
diff --git a/drivers/isdn/hisax/niccy.c b/drivers/isdn/hisax/niccy.c
deleted file mode 100644
index dfbcd2eaa81a..000000000000
diff --git a/drivers/isdn/hisax/nj_s.c b/drivers/isdn/hisax/nj_s.c
deleted file mode 100644
index 32b4bbd18eb9..000000000000
diff --git a/drivers/isdn/hisax/nj_u.c b/drivers/isdn/hisax/nj_u.c
deleted file mode 100644
index 4e8adbede361..000000000000
diff --git a/drivers/isdn/hisax/q931.c b/drivers/isdn/hisax/q931.c
deleted file mode 100644
index 6b8c3fbe3965..000000000000
diff --git a/drivers/isdn/hisax/s0box.c b/drivers/isdn/hisax/s0box.c
deleted file mode 100644
index 4e7d0aa227ad..000000000000
diff --git a/drivers/isdn/hisax/saphir.c b/drivers/isdn/hisax/saphir.c
deleted file mode 100644
index db906cb37a3f..000000000000
diff --git a/drivers/isdn/hisax/sedlbauer.c b/drivers/isdn/hisax/sedlbauer.c
deleted file mode 100644
index c0b97b893495..000000000000
diff --git a/drivers/isdn/hisax/sedlbauer_cs.c b/drivers/isdn/hisax/sedlbauer_cs.c
deleted file mode 100644
index 92ef62d4caf4..000000000000
diff --git a/drivers/isdn/hisax/sportster.c b/drivers/isdn/hisax/sportster.c
deleted file mode 100644
index 18cee6360d0a..000000000000
diff --git a/drivers/isdn/hisax/st5481.h b/drivers/isdn/hisax/st5481.h
deleted file mode 100644
index b421b86ca7da..000000000000
diff --git a/drivers/isdn/hisax/st5481_b.c b/drivers/isdn/hisax/st5481_b.c
deleted file mode 100644
index f64a36007800..000000000000
diff --git a/drivers/isdn/hisax/st5481_d.c b/drivers/isdn/hisax/st5481_d.c
deleted file mode 100644
index e88c5c71fca7..000000000000
diff --git a/drivers/isdn/hisax/st5481_init.c b/drivers/isdn/hisax/st5481_init.c
deleted file mode 100644
index 54ef9e4f8cbc..000000000000
diff --git a/drivers/isdn/hisax/st5481_usb.c b/drivers/isdn/hisax/st5481_usb.c
deleted file mode 100644
index f207fda691c7..000000000000
diff --git a/drivers/isdn/hisax/tei.c b/drivers/isdn/hisax/tei.c
deleted file mode 100644
index 9195f9fd628f..000000000000
diff --git a/drivers/isdn/hisax/teleint.c b/drivers/isdn/hisax/teleint.c
deleted file mode 100644
index 247aa33076b1..000000000000
diff --git a/drivers/isdn/hisax/teles0.c b/drivers/isdn/hisax/teles0.c
deleted file mode 100644
index ce9eabdd2f6e..000000000000
diff --git a/drivers/isdn/hisax/teles3.c b/drivers/isdn/hisax/teles3.c
deleted file mode 100644
index 1eef693f04f0..000000000000
diff --git a/drivers/isdn/hisax/teles_cs.c b/drivers/isdn/hisax/teles_cs.c
deleted file mode 100644
index b8dd14958757..000000000000
diff --git a/drivers/isdn/hisax/telespci.c b/drivers/isdn/hisax/telespci.c
deleted file mode 100644
index 33eeb4602c7e..000000000000
diff --git a/drivers/isdn/hisax/w6692.c b/drivers/isdn/hisax/w6692.c
deleted file mode 100644
index 36eefaa3a7d9..000000000000
diff --git a/drivers/isdn/hisax/w6692.h b/drivers/isdn/hisax/w6692.h
deleted file mode 100644
index 024b04d33e43..000000000000
diff --git a/drivers/isdn/i4l/Kconfig b/drivers/isdn/i4l/Kconfig
index 68e54d9f2f53..dc8ab12199e9 100644
--- a/drivers/isdn/i4l/Kconfig
+++ b/drivers/isdn/i4l/Kconfig
@@ -121,8 +121,6 @@ endmenu
 
 comment "ISDN4Linux hardware drivers"
 
-source "drivers/isdn/hisax/Kconfig"
-
 # end ISDN_I4L
 endif
 
-- 
2.20.0


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [PATCH v2 3/5] isdn: remove isdn4linux
  2019-04-26 19:58 [PATCH v2 0/5] isdn: deprecate non-mISDN drivers Arnd Bergmann
  2019-04-26 19:58 ` [PATCH v2 1/5] isdn: gigaset: remove i4l support Arnd Bergmann
  2019-04-26 19:58 ` [PATCH v2 2/5] isdn: remove hisax driver Arnd Bergmann
@ 2019-04-26 19:58 ` Arnd Bergmann
  2019-04-26 19:58 ` [PATCH v2 4/5] isdn: hdlc: move into mISDN Arnd Bergmann
  2019-04-26 19:58 ` [PATCH v2 5/5] isdn: move capi drivers to staging Arnd Bergmann
  4 siblings, 0 replies; 12+ messages in thread
From: Arnd Bergmann @ 2019-04-26 19:58 UTC (permalink / raw)
  To: netdev
  Cc: isdn4linux, Karsten Keil, Paul Bolle, Holger Schurig,
	Tilman Schmidt, Al Viro, gigaset307x-common, arnd,
	Thomas Jarosch, Birger Harzenetter

With all isdn4linux hardware drivers gone, this is only a wrapper around
CAPI to support old user space. However, from looking at the mailing
list, it seems that the last time anyone asked about it was in 2014,
when the upgrade from a linux-2.4 installation failed, and mISDN was
suggested as a replacement.

The largest public ISDN network (Deutsche Telekom) was supposed to be
shut down 2018, which must have drastically reduced the number of legacy
installations.

When we last discussed removing i4l in 2016, Karsten Keil suggested
revisiting this in 2018. I guess this is overdue.

Link: http://listserv.isdn4linux.de/pipermail/isdn4linux/2014-October/006165.html
Link: https://patchwork.kernel.org/patch/8484861/#17900371
Link: https://listserv.isdn4linux.de/pipermail/isdn4linux/2019-April/thread.html
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 Documentation/isdn/INTERFACE        |  759 ------
 Documentation/isdn/INTERFACE.fax    |  163 --
 Documentation/isdn/README           |  599 -----
 Documentation/isdn/README.FAQ       |   26 -
 Documentation/isdn/README.audio     |  138 -
 Documentation/isdn/README.concap    |  259 --
 Documentation/isdn/README.diversion |  127 -
 Documentation/isdn/README.fax       |   45 -
 Documentation/isdn/README.hfc-pci   |   41 -
 Documentation/isdn/README.syncppp   |   58 -
 Documentation/isdn/README.x25       |  184 --
 Documentation/isdn/syncPPP.FAQ      |  224 --
 Documentation/process/changes.rst   |   16 +-
 MAINTAINERS                         |    2 -
 drivers/isdn/Kconfig                |   26 -
 drivers/isdn/Makefile               |    2 -
 drivers/isdn/capi/Kconfig           |    9 -
 drivers/isdn/capi/capidrv.c         | 2525 ------------------
 drivers/isdn/capi/capidrv.h         |  140 -
 drivers/isdn/divert/Makefile        |    9 -
 drivers/isdn/divert/divert_init.c   |   82 -
 drivers/isdn/divert/divert_procfs.c |  336 ---
 drivers/isdn/divert/isdn_divert.c   |  846 ------
 drivers/isdn/divert/isdn_divert.h   |  132 -
 drivers/isdn/i4l/Kconfig            |  126 -
 drivers/isdn/i4l/Makefile           |   14 -
 drivers/isdn/i4l/isdn_audio.c       |  711 -----
 drivers/isdn/i4l/isdn_audio.h       |   44 -
 drivers/isdn/i4l/isdn_bsdcomp.c     |  930 -------
 drivers/isdn/i4l/isdn_common.c      | 2368 -----------------
 drivers/isdn/i4l/isdn_common.h      |   47 -
 drivers/isdn/i4l/isdn_concap.c      |   99 -
 drivers/isdn/i4l/isdn_concap.h      |   11 -
 drivers/isdn/i4l/isdn_net.c         | 3198 -----------------------
 drivers/isdn/i4l/isdn_net.h         |  151 --
 drivers/isdn/i4l/isdn_ppp.c         | 3046 ----------------------
 drivers/isdn/i4l/isdn_ppp.h         |   41 -
 drivers/isdn/i4l/isdn_tty.c         | 3756 ---------------------------
 drivers/isdn/i4l/isdn_tty.h         |  120 -
 drivers/isdn/i4l/isdn_ttyfax.c      | 1123 --------
 drivers/isdn/i4l/isdn_ttyfax.h      |   17 -
 drivers/isdn/i4l/isdn_v110.c        |  625 -----
 drivers/isdn/i4l/isdn_v110.h        |   29 -
 drivers/isdn/i4l/isdn_x25iface.c    |  332 ---
 drivers/isdn/i4l/isdn_x25iface.h    |   30 -
 drivers/isdn/isdnloop/Makefile      |    5 -
 drivers/isdn/isdnloop/isdnloop.c    | 1528 -----------
 drivers/isdn/isdnloop/isdnloop.h    |  112 -
 include/linux/concap.h              |  112 -
 include/linux/isdn.h                |  473 ----
 include/linux/isdn_divertif.h       |   35 -
 include/linux/isdn_ppp.h            |  194 --
 include/linux/isdnif.h              |  505 ----
 include/linux/wanrouter.h           |   11 -
 include/uapi/linux/isdn.h           |  144 -
 include/uapi/linux/isdn_divertif.h  |   31 -
 include/uapi/linux/isdn_ppp.h       |   68 -
 include/uapi/linux/isdnif.h         |   57 -
 include/uapi/linux/wanrouter.h      |   18 -
 59 files changed, 2 insertions(+), 26857 deletions(-)
 delete mode 100644 Documentation/isdn/INTERFACE
 delete mode 100644 Documentation/isdn/INTERFACE.fax
 delete mode 100644 Documentation/isdn/README
 delete mode 100644 Documentation/isdn/README.FAQ
 delete mode 100644 Documentation/isdn/README.audio
 delete mode 100644 Documentation/isdn/README.concap
 delete mode 100644 Documentation/isdn/README.diversion
 delete mode 100644 Documentation/isdn/README.fax
 delete mode 100644 Documentation/isdn/README.hfc-pci
 delete mode 100644 Documentation/isdn/README.syncppp
 delete mode 100644 Documentation/isdn/README.x25
 delete mode 100644 Documentation/isdn/syncPPP.FAQ
 delete mode 100644 drivers/isdn/capi/capidrv.c
 delete mode 100644 drivers/isdn/capi/capidrv.h
 delete mode 100644 drivers/isdn/divert/Makefile
 delete mode 100644 drivers/isdn/divert/divert_init.c
 delete mode 100644 drivers/isdn/divert/divert_procfs.c
 delete mode 100644 drivers/isdn/divert/isdn_divert.c
 delete mode 100644 drivers/isdn/divert/isdn_divert.h
 delete mode 100644 drivers/isdn/i4l/Kconfig
 delete mode 100644 drivers/isdn/i4l/isdn_audio.c
 delete mode 100644 drivers/isdn/i4l/isdn_audio.h
 delete mode 100644 drivers/isdn/i4l/isdn_bsdcomp.c
 delete mode 100644 drivers/isdn/i4l/isdn_common.c
 delete mode 100644 drivers/isdn/i4l/isdn_common.h
 delete mode 100644 drivers/isdn/i4l/isdn_concap.c
 delete mode 100644 drivers/isdn/i4l/isdn_concap.h
 delete mode 100644 drivers/isdn/i4l/isdn_net.c
 delete mode 100644 drivers/isdn/i4l/isdn_net.h
 delete mode 100644 drivers/isdn/i4l/isdn_ppp.c
 delete mode 100644 drivers/isdn/i4l/isdn_ppp.h
 delete mode 100644 drivers/isdn/i4l/isdn_tty.c
 delete mode 100644 drivers/isdn/i4l/isdn_tty.h
 delete mode 100644 drivers/isdn/i4l/isdn_ttyfax.c
 delete mode 100644 drivers/isdn/i4l/isdn_ttyfax.h
 delete mode 100644 drivers/isdn/i4l/isdn_v110.c
 delete mode 100644 drivers/isdn/i4l/isdn_v110.h
 delete mode 100644 drivers/isdn/i4l/isdn_x25iface.c
 delete mode 100644 drivers/isdn/i4l/isdn_x25iface.h
 delete mode 100644 drivers/isdn/isdnloop/Makefile
 delete mode 100644 drivers/isdn/isdnloop/isdnloop.c
 delete mode 100644 drivers/isdn/isdnloop/isdnloop.h
 delete mode 100644 include/linux/concap.h
 delete mode 100644 include/linux/isdn.h
 delete mode 100644 include/linux/isdn_divertif.h
 delete mode 100644 include/linux/isdn_ppp.h
 delete mode 100644 include/linux/isdnif.h
 delete mode 100644 include/linux/wanrouter.h
 delete mode 100644 include/uapi/linux/isdn.h
 delete mode 100644 include/uapi/linux/isdn_divertif.h
 delete mode 100644 include/uapi/linux/isdn_ppp.h
 delete mode 100644 include/uapi/linux/isdnif.h
 delete mode 100644 include/uapi/linux/wanrouter.h

diff --git a/Documentation/isdn/INTERFACE b/Documentation/isdn/INTERFACE
deleted file mode 100644
index 5df17e5b25c8..000000000000
diff --git a/Documentation/isdn/INTERFACE.fax b/Documentation/isdn/INTERFACE.fax
deleted file mode 100644
index 9c8c6d914ec7..000000000000
diff --git a/Documentation/isdn/README b/Documentation/isdn/README
deleted file mode 100644
index 74bd2bdb455b..000000000000
diff --git a/Documentation/isdn/README.FAQ b/Documentation/isdn/README.FAQ
deleted file mode 100644
index e5dd1addacdd..000000000000
diff --git a/Documentation/isdn/README.audio b/Documentation/isdn/README.audio
deleted file mode 100644
index 8ebca19290d9..000000000000
diff --git a/Documentation/isdn/README.concap b/Documentation/isdn/README.concap
deleted file mode 100644
index a76d74845a4c..000000000000
diff --git a/Documentation/isdn/README.diversion b/Documentation/isdn/README.diversion
deleted file mode 100644
index bddcd5fb86ff..000000000000
diff --git a/Documentation/isdn/README.fax b/Documentation/isdn/README.fax
deleted file mode 100644
index 5314958a8a6e..000000000000
diff --git a/Documentation/isdn/README.hfc-pci b/Documentation/isdn/README.hfc-pci
deleted file mode 100644
index e8a4ef0226e8..000000000000
diff --git a/Documentation/isdn/README.syncppp b/Documentation/isdn/README.syncppp
deleted file mode 100644
index 27d260095cce..000000000000
diff --git a/Documentation/isdn/README.x25 b/Documentation/isdn/README.x25
deleted file mode 100644
index e561a77c4e22..000000000000
diff --git a/Documentation/isdn/syncPPP.FAQ b/Documentation/isdn/syncPPP.FAQ
deleted file mode 100644
index 3257a4bc0786..000000000000
diff --git a/Documentation/process/changes.rst b/Documentation/process/changes.rst
index 18735dc460a0..111636ad1bad 100644
--- a/Documentation/process/changes.rst
+++ b/Documentation/process/changes.rst
@@ -23,8 +23,8 @@ running, the suggested command should tell you.
 
 Again, keep in mind that this list assumes you are already functionally
 running a Linux kernel.  Also, not all tools are necessary on all
-systems; obviously, if you don't have any ISDN hardware, for example,
-you probably needn't concern yourself with isdn4k-utils.
+systems; obviously, if you don't have any PC Card hardware, for example,
+you probably needn't concern yourself with pcmciautils.
 
 ====================== ===============  ========================================
         Program        Minimal version       Command to check the version
@@ -45,7 +45,6 @@ btrfs-progs            0.18             btrfsck
 pcmciautils            004              pccardctl -V
 quota-tools            3.09             quota -V
 PPP                    2.4.0            pppd --version
-isdn4k-utils           3.1pre1          isdnctrl 2>&1|grep version
 nfs-utils              1.0.5            showmount --version
 procps                 3.2.0            ps --version
 oprofile               0.9              oprofiled --version
@@ -279,12 +278,6 @@ which can be made by::
 
 as root.
 
-Isdn4k-utils
-------------
-
-Due to changes in the length of the phone number field, isdn4k-utils
-needs to be recompiled or (preferably) upgraded.
-
 NFS-utils
 ---------
 
@@ -448,11 +441,6 @@ PPP
 
 - <ftp://ftp.samba.org/pub/ppp/>
 
-Isdn4k-utils
-------------
-
-- <ftp://ftp.isdn4linux.de/pub/isdn4linux/utils/>
-
 NFS-utils
 ---------
 
diff --git a/MAINTAINERS b/MAINTAINERS
index 306c289b30c7..f6adf0484dc0 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -8248,9 +8248,7 @@ T:	git git://git.kernel.org/pub/scm/linux/kernel/git/kkeil/isdn-2.6.git
 S:	Maintained
 F:	Documentation/isdn/
 F:	drivers/isdn/
-F:	include/linux/isdn.h
 F:	include/linux/isdn/
-F:	include/uapi/linux/isdn.h
 F:	include/uapi/linux/isdn/
 
 IT87 HARDWARE MONITORING DRIVER
diff --git a/drivers/isdn/Kconfig b/drivers/isdn/Kconfig
index ef661acdda17..161f7527df70 100644
--- a/drivers/isdn/Kconfig
+++ b/drivers/isdn/Kconfig
@@ -20,27 +20,6 @@ menuconfig ISDN
 
 if ISDN
 
-menuconfig ISDN_I4L
-	tristate "Old ISDN4Linux (deprecated)"
-	depends on TTY
-	---help---
-	  This driver allows you to use an ISDN adapter for networking
-	  connections and as dialin/out device.  The isdn-tty's have a built
-	  in AT-compatible modem emulator.  Network devices support autodial,
-	  channel-bundling, callback and caller-authentication without having
-	  a daemon running.  A reduced T.70 protocol is supported with tty's
-	  suitable for German BTX.  On D-Channel, the protocols EDSS1
-	  (Euro-ISDN) and 1TR6 (German style) are supported.  See
-	  <file:Documentation/isdn/README> for more information.
-
-	  ISDN support in the linux kernel is moving towards a new API,
-	  called CAPI (Common ISDN Application Programming Interface).
-	  Therefore the old ISDN4Linux layer will eventually become obsolete.
-	  It is still available, though, for use with adapters that are not
-	  supported by the new CAPI subsystem yet.
-
-source "drivers/isdn/i4l/Kconfig"
-
 menuconfig ISDN_CAPI
 	tristate "CAPI 2.0 subsystem"
 	help
@@ -70,9 +49,4 @@ source "drivers/isdn/hysdn/Kconfig"
 
 source "drivers/isdn/mISDN/Kconfig"
 
-config ISDN_HDLC
-	tristate
-	select CRC_CCITT
-	select BITREVERSE
-
 endif # ISDN
diff --git a/drivers/isdn/Makefile b/drivers/isdn/Makefile
index 7487f0bbe855..379b4a03c321 100644
--- a/drivers/isdn/Makefile
+++ b/drivers/isdn/Makefile
@@ -7,7 +7,5 @@ obj-$(CONFIG_ISDN_I4L)			+= i4l/
 obj-$(CONFIG_ISDN_CAPI)			+= capi/
 obj-$(CONFIG_MISDN)			+= mISDN/
 obj-$(CONFIG_ISDN)			+= hardware/
-obj-$(CONFIG_ISDN_DIVERSION)		+= divert/
-obj-$(CONFIG_ISDN_DRV_LOOP)		+= isdnloop/
 obj-$(CONFIG_HYSDN)			+= hysdn/
 obj-$(CONFIG_ISDN_DRV_GIGASET)		+= gigaset/
diff --git a/drivers/isdn/capi/Kconfig b/drivers/isdn/capi/Kconfig
index 7641b3096ea6..fe4a265c2c6d 100644
--- a/drivers/isdn/capi/Kconfig
+++ b/drivers/isdn/capi/Kconfig
@@ -26,15 +26,6 @@ config ISDN_CAPI_MIDDLEWARE
 	  device.  If you want to use pppd with pppdcapiplugin to dial up to
 	  your ISP, say Y here.
 
-config ISDN_CAPI_CAPIDRV
-	tristate "CAPI2.0 capidrv interface support"
-	depends on ISDN_I4L
-	help
-	  This option provides the glue code to hook up CAPI driven cards to
-	  the legacy isdn4linux link layer.  If you have a card which is
-	  supported by a CAPI driver, but still want to use old features like
-	  ippp interfaces or ttyI emulation, say Y/M here.
-
 config ISDN_CAPI_CAPIDRV_VERBOSE
 	bool "Verbose reason code reporting"
 	depends on ISDN_CAPI_CAPIDRV
diff --git a/drivers/isdn/capi/capidrv.c b/drivers/isdn/capi/capidrv.c
deleted file mode 100644
index e8949f3dcae1..000000000000
diff --git a/drivers/isdn/capi/capidrv.h b/drivers/isdn/capi/capidrv.h
deleted file mode 100644
index 4466b2e0176d..000000000000
diff --git a/drivers/isdn/divert/Makefile b/drivers/isdn/divert/Makefile
deleted file mode 100644
index dd4a202e0bc2..000000000000
diff --git a/drivers/isdn/divert/divert_init.c b/drivers/isdn/divert/divert_init.c
deleted file mode 100644
index 267dede13bfd..000000000000
diff --git a/drivers/isdn/divert/divert_procfs.c b/drivers/isdn/divert/divert_procfs.c
deleted file mode 100644
index 342585e04fd3..000000000000
diff --git a/drivers/isdn/divert/isdn_divert.c b/drivers/isdn/divert/isdn_divert.c
deleted file mode 100644
index 5620fd2c6009..000000000000
diff --git a/drivers/isdn/divert/isdn_divert.h b/drivers/isdn/divert/isdn_divert.h
deleted file mode 100644
index 55033dd872c0..000000000000
diff --git a/drivers/isdn/i4l/Kconfig b/drivers/isdn/i4l/Kconfig
deleted file mode 100644
index dc8ab12199e9..000000000000
diff --git a/drivers/isdn/i4l/Makefile b/drivers/isdn/i4l/Makefile
index be77500c9e86..11fe697739d5 100644
--- a/drivers/isdn/i4l/Makefile
+++ b/drivers/isdn/i4l/Makefile
@@ -3,18 +3,4 @@
 
 # Each configuration option enables a list of files.
 
-obj-$(CONFIG_ISDN_I4L)		+= isdn.o
-obj-$(CONFIG_ISDN_PPP_BSDCOMP)	+= isdn_bsdcomp.o
 obj-$(CONFIG_ISDN_HDLC)		+= isdnhdlc.o
-
-# Multipart objects.
-
-isdn-y				:= isdn_net.o isdn_tty.o isdn_v110.o isdn_common.o
-
-# Optional parts of multipart objects.
-
-isdn-$(CONFIG_ISDN_PPP)		+= isdn_ppp.o
-isdn-$(CONFIG_ISDN_X25)		+= isdn_concap.o isdn_x25iface.o
-isdn-$(CONFIG_ISDN_AUDIO)		+= isdn_audio.o
-isdn-$(CONFIG_ISDN_TTY_FAX)	+= isdn_ttyfax.o
-
diff --git a/drivers/isdn/i4l/isdn_audio.c b/drivers/isdn/i4l/isdn_audio.c
deleted file mode 100644
index b6bcd1eca128..000000000000
diff --git a/drivers/isdn/i4l/isdn_audio.h b/drivers/isdn/i4l/isdn_audio.h
deleted file mode 100644
index 013c3582e0d1..000000000000
diff --git a/drivers/isdn/i4l/isdn_bsdcomp.c b/drivers/isdn/i4l/isdn_bsdcomp.c
deleted file mode 100644
index 7f28b967ed19..000000000000
diff --git a/drivers/isdn/i4l/isdn_common.c b/drivers/isdn/i4l/isdn_common.c
deleted file mode 100644
index 74ee00f5b310..000000000000
diff --git a/drivers/isdn/i4l/isdn_common.h b/drivers/isdn/i4l/isdn_common.h
deleted file mode 100644
index 2260ef07ab9c..000000000000
diff --git a/drivers/isdn/i4l/isdn_concap.c b/drivers/isdn/i4l/isdn_concap.c
deleted file mode 100644
index 336523ec077c..000000000000
diff --git a/drivers/isdn/i4l/isdn_concap.h b/drivers/isdn/i4l/isdn_concap.h
deleted file mode 100644
index cd7e3ba74e25..000000000000
diff --git a/drivers/isdn/i4l/isdn_net.c b/drivers/isdn/i4l/isdn_net.c
deleted file mode 100644
index c138f66f2659..000000000000
diff --git a/drivers/isdn/i4l/isdn_net.h b/drivers/isdn/i4l/isdn_net.h
deleted file mode 100644
index cca6d68da171..000000000000
diff --git a/drivers/isdn/i4l/isdn_ppp.c b/drivers/isdn/i4l/isdn_ppp.c
deleted file mode 100644
index 7e0f419c14f8..000000000000
diff --git a/drivers/isdn/i4l/isdn_ppp.h b/drivers/isdn/i4l/isdn_ppp.h
deleted file mode 100644
index 34b8a2ce84f3..000000000000
diff --git a/drivers/isdn/i4l/isdn_tty.c b/drivers/isdn/i4l/isdn_tty.c
deleted file mode 100644
index 43700fc19a31..000000000000
diff --git a/drivers/isdn/i4l/isdn_tty.h b/drivers/isdn/i4l/isdn_tty.h
deleted file mode 100644
index a6f801d2263b..000000000000
diff --git a/drivers/isdn/i4l/isdn_ttyfax.c b/drivers/isdn/i4l/isdn_ttyfax.c
deleted file mode 100644
index 47aae4916730..000000000000
diff --git a/drivers/isdn/i4l/isdn_ttyfax.h b/drivers/isdn/i4l/isdn_ttyfax.h
deleted file mode 100644
index ccda4fcf8f7b..000000000000
diff --git a/drivers/isdn/i4l/isdn_v110.c b/drivers/isdn/i4l/isdn_v110.c
deleted file mode 100644
index d11fe76f138f..000000000000
diff --git a/drivers/isdn/i4l/isdn_v110.h b/drivers/isdn/i4l/isdn_v110.h
deleted file mode 100644
index de774ab598c9..000000000000
diff --git a/drivers/isdn/i4l/isdn_x25iface.c b/drivers/isdn/i4l/isdn_x25iface.c
deleted file mode 100644
index 48bfbcb4a09d..000000000000
diff --git a/drivers/isdn/i4l/isdn_x25iface.h b/drivers/isdn/i4l/isdn_x25iface.h
deleted file mode 100644
index ca08e082cf7c..000000000000
diff --git a/drivers/isdn/isdnloop/Makefile b/drivers/isdn/isdnloop/Makefile
deleted file mode 100644
index 317cd3c5b8ee..000000000000
diff --git a/drivers/isdn/isdnloop/isdnloop.c b/drivers/isdn/isdnloop/isdnloop.c
deleted file mode 100644
index 755c6bbc9553..000000000000
diff --git a/drivers/isdn/isdnloop/isdnloop.h b/drivers/isdn/isdnloop/isdnloop.h
deleted file mode 100644
index e9e035552bb4..000000000000
diff --git a/include/linux/concap.h b/include/linux/concap.h
deleted file mode 100644
index 977acb3d1fb2..000000000000
diff --git a/include/linux/isdn.h b/include/linux/isdn.h
deleted file mode 100644
index df97c8444f5d..000000000000
diff --git a/include/linux/isdn_divertif.h b/include/linux/isdn_divertif.h
deleted file mode 100644
index 19ab361f9f07..000000000000
diff --git a/include/linux/isdn_ppp.h b/include/linux/isdn_ppp.h
deleted file mode 100644
index a0070c6dfaf8..000000000000
diff --git a/include/linux/isdnif.h b/include/linux/isdnif.h
deleted file mode 100644
index 8d80fdc68647..000000000000
diff --git a/include/linux/wanrouter.h b/include/linux/wanrouter.h
deleted file mode 100644
index f6358558f9f5..000000000000
diff --git a/include/uapi/linux/isdn.h b/include/uapi/linux/isdn.h
deleted file mode 100644
index f371fd52ed75..000000000000
diff --git a/include/uapi/linux/isdn_divertif.h b/include/uapi/linux/isdn_divertif.h
deleted file mode 100644
index 0a17bb1bcb1b..000000000000
diff --git a/include/uapi/linux/isdn_ppp.h b/include/uapi/linux/isdn_ppp.h
deleted file mode 100644
index 0bdc4efaacb2..000000000000
diff --git a/include/uapi/linux/isdnif.h b/include/uapi/linux/isdnif.h
deleted file mode 100644
index 611a69196738..000000000000
diff --git a/include/uapi/linux/wanrouter.h b/include/uapi/linux/wanrouter.h
deleted file mode 100644
index 2f1216d00caa..000000000000
-- 
2.20.0


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [PATCH v2 4/5] isdn: hdlc: move into mISDN
  2019-04-26 19:58 [PATCH v2 0/5] isdn: deprecate non-mISDN drivers Arnd Bergmann
                   ` (2 preceding siblings ...)
  2019-04-26 19:58 ` [PATCH v2 3/5] isdn: remove isdn4linux Arnd Bergmann
@ 2019-04-26 19:58 ` Arnd Bergmann
  2019-04-26 19:58 ` [PATCH v2 5/5] isdn: move capi drivers to staging Arnd Bergmann
  4 siblings, 0 replies; 12+ messages in thread
From: Arnd Bergmann @ 2019-04-26 19:58 UTC (permalink / raw)
  To: netdev
  Cc: isdn4linux, Karsten Keil, Paul Bolle, Holger Schurig,
	Tilman Schmidt, Al Viro, gigaset307x-common, arnd,
	Thomas Jarosch, Birger Harzenetter

The last remnant of the isdn4linux interface is now the isdnhdlc
support, used by the netjet driver. Move it next to that driver.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 drivers/isdn/Makefile                                      | 1 -
 drivers/isdn/hardware/mISDN/Kconfig                        | 7 +++++--
 drivers/isdn/hardware/mISDN/Makefile                       | 2 ++
 drivers/isdn/{i4l => hardware/mISDN}/isdnhdlc.c            | 2 +-
 .../isdn/hdlc.h => drivers/isdn/hardware/mISDN/isdnhdlc.h  | 0
 drivers/isdn/hardware/mISDN/netjet.c                       | 2 +-
 drivers/isdn/i4l/Makefile                                  | 6 ------
 7 files changed, 9 insertions(+), 11 deletions(-)
 rename drivers/isdn/{i4l => hardware/mISDN}/isdnhdlc.c (99%)
 rename include/linux/isdn/hdlc.h => drivers/isdn/hardware/mISDN/isdnhdlc.h (100%)
 delete mode 100644 drivers/isdn/i4l/Makefile

diff --git a/drivers/isdn/Makefile b/drivers/isdn/Makefile
index 379b4a03c321..f2a529c5a511 100644
--- a/drivers/isdn/Makefile
+++ b/drivers/isdn/Makefile
@@ -3,7 +3,6 @@
 
 # Object files in subdirectories
 
-obj-$(CONFIG_ISDN_I4L)			+= i4l/
 obj-$(CONFIG_ISDN_CAPI)			+= capi/
 obj-$(CONFIG_MISDN)			+= mISDN/
 obj-$(CONFIG_ISDN)			+= hardware/
diff --git a/drivers/isdn/hardware/mISDN/Kconfig b/drivers/isdn/hardware/mISDN/Kconfig
index fda912b0833f..da30d85c9236 100644
--- a/drivers/isdn/hardware/mISDN/Kconfig
+++ b/drivers/isdn/hardware/mISDN/Kconfig
@@ -78,11 +78,14 @@ config MISDN_NETJET
 	depends on PCI
 	depends on TTY
 	select MISDN_IPAC
-	select ISDN_HDLC
-	select ISDN_I4L
+	select MISDN_HDLC
 	help
 	  Enable support for Traverse Technologies NETJet PCI cards.
 
+config MISDN_HDLC
+	tristate
+	select CRC_CCITT
+	select BITREVERSE
 
 config MISDN_IPAC
 	tristate
diff --git a/drivers/isdn/hardware/mISDN/Makefile b/drivers/isdn/hardware/mISDN/Makefile
index 422f9fd8ab9a..3f50f8c4753f 100644
--- a/drivers/isdn/hardware/mISDN/Makefile
+++ b/drivers/isdn/hardware/mISDN/Makefile
@@ -15,3 +15,5 @@ obj-$(CONFIG_MISDN_NETJET) += netjet.o
 # chip modules
 obj-$(CONFIG_MISDN_IPAC) += mISDNipac.o
 obj-$(CONFIG_MISDN_ISAR) += mISDNisar.o
+
+obj-$(CONFIG_MISDN_HDLC) += isdnhdlc.o
diff --git a/drivers/isdn/i4l/isdnhdlc.c b/drivers/isdn/hardware/mISDN/isdnhdlc.c
similarity index 99%
rename from drivers/isdn/i4l/isdnhdlc.c
rename to drivers/isdn/hardware/mISDN/isdnhdlc.c
index 027d1c590679..3a8b562e63b1 100644
--- a/drivers/isdn/i4l/isdnhdlc.c
+++ b/drivers/isdn/hardware/mISDN/isdnhdlc.c
@@ -25,8 +25,8 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/crc-ccitt.h>
-#include <linux/isdn/hdlc.h>
 #include <linux/bitrev.h>
+#include "isdnhdlc.h"
 
 /*-------------------------------------------------------------------*/
 
diff --git a/include/linux/isdn/hdlc.h b/drivers/isdn/hardware/mISDN/isdnhdlc.h
similarity index 100%
rename from include/linux/isdn/hdlc.h
rename to drivers/isdn/hardware/mISDN/isdnhdlc.h
diff --git a/drivers/isdn/hardware/mISDN/netjet.c b/drivers/isdn/hardware/mISDN/netjet.c
index 2b317cb63d06..93a2d361eda5 100644
--- a/drivers/isdn/hardware/mISDN/netjet.c
+++ b/drivers/isdn/hardware/mISDN/netjet.c
@@ -29,7 +29,7 @@
 #include "ipac.h"
 #include "iohelper.h"
 #include "netjet.h"
-#include <linux/isdn/hdlc.h>
+#include "isdnhdlc.h"
 
 #define NETJET_REV	"2.0"
 
diff --git a/drivers/isdn/i4l/Makefile b/drivers/isdn/i4l/Makefile
deleted file mode 100644
index 11fe697739d5..000000000000
-- 
2.20.0


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [PATCH v2 5/5] isdn: move capi drivers to staging
  2019-04-26 19:58 [PATCH v2 0/5] isdn: deprecate non-mISDN drivers Arnd Bergmann
                   ` (3 preceding siblings ...)
  2019-04-26 19:58 ` [PATCH v2 4/5] isdn: hdlc: move into mISDN Arnd Bergmann
@ 2019-04-26 19:58 ` Arnd Bergmann
  2021-11-08  9:48   ` Thomas Jarosch
  4 siblings, 1 reply; 12+ messages in thread
From: Arnd Bergmann @ 2019-04-26 19:58 UTC (permalink / raw)
  To: netdev
  Cc: isdn4linux, Karsten Keil, Paul Bolle, Holger Schurig,
	Tilman Schmidt, Al Viro, gigaset307x-common, arnd,
	Thomas Jarosch, Birger Harzenetter, Marcel Holtmann

I tried to find any indication of whether the capi drivers are still in
use, and have not found anything from a long time ago.

With public ISDN networks almost completely shut down over the past 12
months, there is very little you can actually do with this hardware. The
main remaining use case would be to connect ISDN voice phones to an
in-house installation with Asterisk or LCR, but anyone trying this in
turn seems to be using either the mISDN driver stack, or out-of-tree
drivers from the hardware vendors.

I may of course have missed something, so I would suggest moving these
three drivers (avm, hysdn, gigaset) into drivers/staging/ just in case
someone still uses them.

If nobody complains, we can remove them entirely in six months, or
otherwise move the core code and any drivers that are still needed back
into drivers/isdn.

As Paul Bolle notes, he is still testing the gigaset driver as long as
he can, but the Dutch ISDN network will be shut down in September 2019,
which puts an end to that.

Marcel Holtmann still maintains the Bluetooth CMTP profile and wants to
keep that alive, so the actual CAPI subsystem code remains in place for
now, after all other drivers are gone, CMTP and CAPI can be merged into
a single driver directory.

Cc: Marcel Holtmann <marcel@holtmann.org>
Cc: Paul Bolle <pebolle@tiscali.nl>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 MAINTAINERS                                   | 20 ++++++++++-----
 drivers/isdn/Kconfig                          | 25 -------------------
 drivers/isdn/Makefile                         |  2 --
 drivers/isdn/capi/Kconfig                     | 20 +++++++++++++++
 drivers/isdn/capi/Makefile                    |  2 ++
 drivers/isdn/hardware/Kconfig                 |  7 ------
 drivers/isdn/hardware/Makefile                |  1 -
 drivers/staging/Kconfig                       |  2 ++
 drivers/staging/Makefile                      |  1 +
 drivers/staging/isdn/Kconfig                  | 11 ++++++++
 drivers/staging/isdn/Makefile                 |  8 ++++++
 drivers/staging/isdn/TODO                     | 22 ++++++++++++++++
 .../hardware => staging/isdn}/avm/Kconfig     |  0
 .../hardware => staging/isdn}/avm/Makefile    |  0
 .../hardware => staging/isdn}/avm/avm_cs.c    |  0
 .../hardware => staging/isdn}/avm/avmcard.h   |  0
 .../{isdn/hardware => staging/isdn}/avm/b1.c  |  0
 .../hardware => staging/isdn}/avm/b1dma.c     |  0
 .../hardware => staging/isdn}/avm/b1isa.c     |  0
 .../hardware => staging/isdn}/avm/b1pci.c     |  0
 .../hardware => staging/isdn}/avm/b1pcmcia.c  |  0
 .../{isdn/hardware => staging/isdn}/avm/c4.c  |  0
 .../hardware => staging/isdn}/avm/t1isa.c     |  0
 .../hardware => staging/isdn}/avm/t1pci.c     |  0
 drivers/{ => staging}/isdn/gigaset/Kconfig    |  0
 drivers/{ => staging}/isdn/gigaset/Makefile   |  0
 .../{ => staging}/isdn/gigaset/asyncdata.c    |  0
 .../{ => staging}/isdn/gigaset/bas-gigaset.c  |  0
 drivers/{ => staging}/isdn/gigaset/capi.c     |  0
 drivers/{ => staging}/isdn/gigaset/common.c   |  0
 drivers/{ => staging}/isdn/gigaset/dummyll.c  |  0
 drivers/{ => staging}/isdn/gigaset/ev-layer.c |  0
 drivers/{ => staging}/isdn/gigaset/gigaset.h  |  0
 .../{ => staging}/isdn/gigaset/interface.c    |  0
 drivers/{ => staging}/isdn/gigaset/isocdata.c |  0
 drivers/{ => staging}/isdn/gigaset/proc.c     |  0
 .../{ => staging}/isdn/gigaset/ser-gigaset.c  |  0
 .../{ => staging}/isdn/gigaset/usb-gigaset.c  |  0
 drivers/{ => staging}/isdn/hysdn/Kconfig      |  0
 drivers/{ => staging}/isdn/hysdn/Makefile     |  0
 drivers/{ => staging}/isdn/hysdn/boardergo.c  |  0
 drivers/{ => staging}/isdn/hysdn/boardergo.h  |  0
 drivers/{ => staging}/isdn/hysdn/hycapi.c     |  0
 drivers/{ => staging}/isdn/hysdn/hysdn_boot.c |  0
 drivers/{ => staging}/isdn/hysdn/hysdn_defs.h |  0
 drivers/{ => staging}/isdn/hysdn/hysdn_init.c |  0
 drivers/{ => staging}/isdn/hysdn/hysdn_net.c  |  0
 drivers/{ => staging}/isdn/hysdn/hysdn_pof.h  |  0
 .../{ => staging}/isdn/hysdn/hysdn_procconf.c |  0
 .../{ => staging}/isdn/hysdn/hysdn_proclog.c  |  0
 .../{ => staging}/isdn/hysdn/hysdn_sched.c    |  0
 drivers/{ => staging}/isdn/hysdn/ince1pc.h    |  0
 52 files changed, 80 insertions(+), 41 deletions(-)
 delete mode 100644 drivers/isdn/hardware/Kconfig
 create mode 100644 drivers/staging/isdn/Kconfig
 create mode 100644 drivers/staging/isdn/Makefile
 create mode 100644 drivers/staging/isdn/TODO
 rename drivers/{isdn/hardware => staging/isdn}/avm/Kconfig (100%)
 rename drivers/{isdn/hardware => staging/isdn}/avm/Makefile (100%)
 rename drivers/{isdn/hardware => staging/isdn}/avm/avm_cs.c (100%)
 rename drivers/{isdn/hardware => staging/isdn}/avm/avmcard.h (100%)
 rename drivers/{isdn/hardware => staging/isdn}/avm/b1.c (100%)
 rename drivers/{isdn/hardware => staging/isdn}/avm/b1dma.c (100%)
 rename drivers/{isdn/hardware => staging/isdn}/avm/b1isa.c (100%)
 rename drivers/{isdn/hardware => staging/isdn}/avm/b1pci.c (100%)
 rename drivers/{isdn/hardware => staging/isdn}/avm/b1pcmcia.c (100%)
 rename drivers/{isdn/hardware => staging/isdn}/avm/c4.c (100%)
 rename drivers/{isdn/hardware => staging/isdn}/avm/t1isa.c (100%)
 rename drivers/{isdn/hardware => staging/isdn}/avm/t1pci.c (100%)
 rename drivers/{ => staging}/isdn/gigaset/Kconfig (100%)
 rename drivers/{ => staging}/isdn/gigaset/Makefile (100%)
 rename drivers/{ => staging}/isdn/gigaset/asyncdata.c (100%)
 rename drivers/{ => staging}/isdn/gigaset/bas-gigaset.c (100%)
 rename drivers/{ => staging}/isdn/gigaset/capi.c (100%)
 rename drivers/{ => staging}/isdn/gigaset/common.c (100%)
 rename drivers/{ => staging}/isdn/gigaset/dummyll.c (100%)
 rename drivers/{ => staging}/isdn/gigaset/ev-layer.c (100%)
 rename drivers/{ => staging}/isdn/gigaset/gigaset.h (100%)
 rename drivers/{ => staging}/isdn/gigaset/interface.c (100%)
 rename drivers/{ => staging}/isdn/gigaset/isocdata.c (100%)
 rename drivers/{ => staging}/isdn/gigaset/proc.c (100%)
 rename drivers/{ => staging}/isdn/gigaset/ser-gigaset.c (100%)
 rename drivers/{ => staging}/isdn/gigaset/usb-gigaset.c (100%)
 rename drivers/{ => staging}/isdn/hysdn/Kconfig (100%)
 rename drivers/{ => staging}/isdn/hysdn/Makefile (100%)
 rename drivers/{ => staging}/isdn/hysdn/boardergo.c (100%)
 rename drivers/{ => staging}/isdn/hysdn/boardergo.h (100%)
 rename drivers/{ => staging}/isdn/hysdn/hycapi.c (100%)
 rename drivers/{ => staging}/isdn/hysdn/hysdn_boot.c (100%)
 rename drivers/{ => staging}/isdn/hysdn/hysdn_defs.h (100%)
 rename drivers/{ => staging}/isdn/hysdn/hysdn_init.c (100%)
 rename drivers/{ => staging}/isdn/hysdn/hysdn_net.c (100%)
 rename drivers/{ => staging}/isdn/hysdn/hysdn_pof.h (100%)
 rename drivers/{ => staging}/isdn/hysdn/hysdn_procconf.c (100%)
 rename drivers/{ => staging}/isdn/hysdn/hysdn_proclog.c (100%)
 rename drivers/{ => staging}/isdn/hysdn/hysdn_sched.c (100%)
 rename drivers/{ => staging}/isdn/hysdn/ince1pc.h (100%)

diff --git a/MAINTAINERS b/MAINTAINERS
index f6adf0484dc0..05ab6963cf75 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6560,9 +6560,7 @@ M:	Paul Bolle <pebolle@tiscali.nl>
 L:	gigaset307x-common@lists.sourceforge.net
 W:	http://gigaset307x.sourceforge.net/
 S:	Odd Fixes
-F:	Documentation/isdn/README.gigaset
-F:	drivers/isdn/gigaset/
-F:	include/uapi/linux/gigaset_dev.h
+F:	drivers/staging/isdn/gigaset/
 
 GNSS SUBSYSTEM
 M:	Johan Hovold <johan@kernel.org>
@@ -8239,15 +8237,25 @@ S:	Supported
 W:	http://www.linux-iscsi.org
 F:	drivers/infiniband/ulp/isert
 
-ISDN SUBSYSTEM
+ISDN/mISDN SUBSYSTEM
 M:	Karsten Keil <isdn@linux-pingi.de>
 L:	isdn4linux@listserv.isdn4linux.de (subscribers-only)
 L:	netdev@vger.kernel.org
 W:	http://www.isdn4linux.de
-T:	git git://git.kernel.org/pub/scm/linux/kernel/git/kkeil/isdn-2.6.git
 S:	Maintained
+F:	drivers/isdn/mISDN
+F:	drivers/isdn/hardware
+
+ISDN/CAPI SUBSYSTEM
+M:	Karsten Keil <isdn@linux-pingi.de>
+L:	isdn4linux@listserv.isdn4linux.de (subscribers-only)
+L:	netdev@vger.kernel.org
+W:	http://www.isdn4linux.de
+S:	Odd Fixes
 F:	Documentation/isdn/
-F:	drivers/isdn/
+F:	drivers/isdn/capi/
+F:	drivers/staging/isdn/
+F:	net/bluetooth/cmtp/
 F:	include/linux/isdn/
 F:	include/uapi/linux/isdn/
 
diff --git a/drivers/isdn/Kconfig b/drivers/isdn/Kconfig
index 161f7527df70..ea452f39952b 100644
--- a/drivers/isdn/Kconfig
+++ b/drivers/isdn/Kconfig
@@ -20,33 +20,8 @@ menuconfig ISDN
 
 if ISDN
 
-menuconfig ISDN_CAPI
-	tristate "CAPI 2.0 subsystem"
-	help
-	  This provides CAPI (the Common ISDN Application Programming
-	  Interface) Version 2.0, a standard making it easy for programs to
-	  access ISDN hardware in a device independent way. (For details see
-	  <http://www.capi.org/>.)  CAPI supports making and accepting voice
-	  and data connections, controlling call options and protocols,
-	  as well as ISDN supplementary services like call forwarding or
-	  three-party conferences (if supported by the specific hardware
-	  driver).
-
-	  Select this option and the appropriate hardware driver below if
-	  you have an ISDN adapter supported by the CAPI subsystem.
-
-if ISDN_CAPI
-
 source "drivers/isdn/capi/Kconfig"
 
-source "drivers/isdn/hardware/Kconfig"
-
-endif # ISDN_CAPI
-
-source "drivers/isdn/gigaset/Kconfig"
-
-source "drivers/isdn/hysdn/Kconfig"
-
 source "drivers/isdn/mISDN/Kconfig"
 
 endif # ISDN
diff --git a/drivers/isdn/Makefile b/drivers/isdn/Makefile
index f2a529c5a511..63baf27a2c79 100644
--- a/drivers/isdn/Makefile
+++ b/drivers/isdn/Makefile
@@ -6,5 +6,3 @@
 obj-$(CONFIG_ISDN_CAPI)			+= capi/
 obj-$(CONFIG_MISDN)			+= mISDN/
 obj-$(CONFIG_ISDN)			+= hardware/
-obj-$(CONFIG_HYSDN)			+= hysdn/
-obj-$(CONFIG_ISDN_DRV_GIGASET)		+= gigaset/
diff --git a/drivers/isdn/capi/Kconfig b/drivers/isdn/capi/Kconfig
index fe4a265c2c6d..6c3af9a271e7 100644
--- a/drivers/isdn/capi/Kconfig
+++ b/drivers/isdn/capi/Kconfig
@@ -1,3 +1,21 @@
+menuconfig ISDN_CAPI
+	tristate "CAPI 2.0 subsystem"
+	help
+	  This provides CAPI (the Common ISDN Application Programming
+	  Interface) Version 2.0, a standard making it easy for programs to
+	  access ISDN hardware in a device independent way. (For details see
+	  <http://www.capi.org/>.)  CAPI supports making and accepting voice
+	  and data connections, controlling call options and protocols,
+	  as well as ISDN supplementary services like call forwarding or
+	  three-party conferences (if supported by the specific hardware
+	  driver).
+
+	  This subsystem requires a hardware specific driver.
+	  See CONFIG_BT_CMTP for the last remaining regular driver
+	  in the kernel that uses the CAPI subsystem.
+
+if ISDN_CAPI
+
 config CAPI_TRACE
 	bool "CAPI trace support"
 	default y
@@ -33,3 +51,5 @@ config ISDN_CAPI_CAPIDRV_VERBOSE
 	  If you say Y here, the capidrv interface will give verbose reasons
 	  for disconnecting. This will increase the size of the kernel by 7 KB.
 	  If unsure, say N.
+
+endif
diff --git a/drivers/isdn/capi/Makefile b/drivers/isdn/capi/Makefile
index 06da3ed2c40a..d299f3e75f89 100644
--- a/drivers/isdn/capi/Makefile
+++ b/drivers/isdn/capi/Makefile
@@ -13,3 +13,5 @@ obj-$(CONFIG_ISDN_CAPI_CAPIDRV)		+= capidrv.o
 
 kernelcapi-y				:= kcapi.o capiutil.o capilib.o
 kernelcapi-$(CONFIG_PROC_FS)		+= kcapi_proc.o
+
+ccflags-y += -I$(srctree)/$(src)/../include -I$(srctree)/$(src)/../include/uapi
diff --git a/drivers/isdn/hardware/Kconfig b/drivers/isdn/hardware/Kconfig
deleted file mode 100644
index 95c403088cce..000000000000
diff --git a/drivers/isdn/hardware/Makefile b/drivers/isdn/hardware/Makefile
index e503032b05a0..da55c4a285f6 100644
--- a/drivers/isdn/hardware/Makefile
+++ b/drivers/isdn/hardware/Makefile
@@ -2,5 +2,4 @@
 
 # Object files in subdirectories
 
-obj-$(CONFIG_CAPI_AVM)		+= avm/
 obj-$(CONFIG_MISDN)		+= mISDN/
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index 62951e836cbc..53e748b90c2c 100644
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -122,4 +122,6 @@ source "drivers/staging/axis-fifo/Kconfig"
 
 source "drivers/staging/erofs/Kconfig"
 
+source "drivers/staging/isdn/Kconfig"
+
 endif # STAGING
diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index d1b17ddcd354..dab0be5ae2ec 100644
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -51,3 +51,4 @@ obj-$(CONFIG_SOC_MT7621)	+= mt7621-dts/
 obj-$(CONFIG_STAGING_GASKET_FRAMEWORK)	+= gasket/
 obj-$(CONFIG_XIL_AXIS_FIFO)	+= axis-fifo/
 obj-$(CONFIG_EROFS_FS)		+= erofs/
+obj-$(CONFIG_ISDN_CAPI)		+= isdn/
diff --git a/drivers/staging/isdn/Kconfig b/drivers/staging/isdn/Kconfig
new file mode 100644
index 000000000000..43e5cc46d4f2
--- /dev/null
+++ b/drivers/staging/isdn/Kconfig
@@ -0,0 +1,11 @@
+menu "ISDN CAPI drivers"
+	depends on ISDN_CAPI
+
+source "drivers/staging/isdn/avm/Kconfig"
+
+source "drivers/staging/isdn/gigaset/Kconfig"
+
+source "drivers/staging/isdn/hysdn/Kconfig"
+
+endmenu
+
diff --git a/drivers/staging/isdn/Makefile b/drivers/staging/isdn/Makefile
new file mode 100644
index 000000000000..025504bae5df
--- /dev/null
+++ b/drivers/staging/isdn/Makefile
@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: GPL-2.0
+# Makefile for the kernel ISDN subsystem and device drivers.
+
+# Object files in subdirectories
+
+obj-$(CONFIG_CAPI_AVM)			+= avm/
+obj-$(CONFIG_HYSDN)			+= hysdn/
+obj-$(CONFIG_ISDN_DRV_GIGASET)		+= gigaset/
diff --git a/drivers/staging/isdn/TODO b/drivers/staging/isdn/TODO
new file mode 100644
index 000000000000..9210d11eb68b
--- /dev/null
+++ b/drivers/staging/isdn/TODO
@@ -0,0 +1,22 @@
+TODO: Remove in late 2019 unless there are users
+
+
+I tried to find any indication of whether the capi drivers are
+still in use, and have not found anything  from a long time ago.
+
+With public ISDN networks almost completely shut down over the past 12
+months, there is very little you can actually do with this hardware. The
+main remaining use case would be to connect ISDN voice phones to an
+in-house installation with Asterisk or LCR, but anyone trying this in
+turn seems to be using either the mISDN driver stack, or out-of-tree
+drivers from the hardware vendors.
+
+I may of course have missed something, so I would suggest moving
+these into drivers/staging/ just in case someone still uses one
+of the three remaining in-kernel drivers (avm, hysdn, gigaset).
+
+If nobody complains, we can remove them entirely in six months,
+or otherwise move the core code and any drivers that are still
+needed back into drivers/isdn.
+
+  Arnd Bergmann <arnd@arndb.de>
diff --git a/drivers/isdn/hardware/avm/Kconfig b/drivers/staging/isdn/avm/Kconfig
similarity index 100%
rename from drivers/isdn/hardware/avm/Kconfig
rename to drivers/staging/isdn/avm/Kconfig
diff --git a/drivers/isdn/hardware/avm/Makefile b/drivers/staging/isdn/avm/Makefile
similarity index 100%
rename from drivers/isdn/hardware/avm/Makefile
rename to drivers/staging/isdn/avm/Makefile
diff --git a/drivers/isdn/hardware/avm/avm_cs.c b/drivers/staging/isdn/avm/avm_cs.c
similarity index 100%
rename from drivers/isdn/hardware/avm/avm_cs.c
rename to drivers/staging/isdn/avm/avm_cs.c
diff --git a/drivers/isdn/hardware/avm/avmcard.h b/drivers/staging/isdn/avm/avmcard.h
similarity index 100%
rename from drivers/isdn/hardware/avm/avmcard.h
rename to drivers/staging/isdn/avm/avmcard.h
diff --git a/drivers/isdn/hardware/avm/b1.c b/drivers/staging/isdn/avm/b1.c
similarity index 100%
rename from drivers/isdn/hardware/avm/b1.c
rename to drivers/staging/isdn/avm/b1.c
diff --git a/drivers/isdn/hardware/avm/b1dma.c b/drivers/staging/isdn/avm/b1dma.c
similarity index 100%
rename from drivers/isdn/hardware/avm/b1dma.c
rename to drivers/staging/isdn/avm/b1dma.c
diff --git a/drivers/isdn/hardware/avm/b1isa.c b/drivers/staging/isdn/avm/b1isa.c
similarity index 100%
rename from drivers/isdn/hardware/avm/b1isa.c
rename to drivers/staging/isdn/avm/b1isa.c
diff --git a/drivers/isdn/hardware/avm/b1pci.c b/drivers/staging/isdn/avm/b1pci.c
similarity index 100%
rename from drivers/isdn/hardware/avm/b1pci.c
rename to drivers/staging/isdn/avm/b1pci.c
diff --git a/drivers/isdn/hardware/avm/b1pcmcia.c b/drivers/staging/isdn/avm/b1pcmcia.c
similarity index 100%
rename from drivers/isdn/hardware/avm/b1pcmcia.c
rename to drivers/staging/isdn/avm/b1pcmcia.c
diff --git a/drivers/isdn/hardware/avm/c4.c b/drivers/staging/isdn/avm/c4.c
similarity index 100%
rename from drivers/isdn/hardware/avm/c4.c
rename to drivers/staging/isdn/avm/c4.c
diff --git a/drivers/isdn/hardware/avm/t1isa.c b/drivers/staging/isdn/avm/t1isa.c
similarity index 100%
rename from drivers/isdn/hardware/avm/t1isa.c
rename to drivers/staging/isdn/avm/t1isa.c
diff --git a/drivers/isdn/hardware/avm/t1pci.c b/drivers/staging/isdn/avm/t1pci.c
similarity index 100%
rename from drivers/isdn/hardware/avm/t1pci.c
rename to drivers/staging/isdn/avm/t1pci.c
diff --git a/drivers/isdn/gigaset/Kconfig b/drivers/staging/isdn/gigaset/Kconfig
similarity index 100%
rename from drivers/isdn/gigaset/Kconfig
rename to drivers/staging/isdn/gigaset/Kconfig
diff --git a/drivers/isdn/gigaset/Makefile b/drivers/staging/isdn/gigaset/Makefile
similarity index 100%
rename from drivers/isdn/gigaset/Makefile
rename to drivers/staging/isdn/gigaset/Makefile
diff --git a/drivers/isdn/gigaset/asyncdata.c b/drivers/staging/isdn/gigaset/asyncdata.c
similarity index 100%
rename from drivers/isdn/gigaset/asyncdata.c
rename to drivers/staging/isdn/gigaset/asyncdata.c
diff --git a/drivers/isdn/gigaset/bas-gigaset.c b/drivers/staging/isdn/gigaset/bas-gigaset.c
similarity index 100%
rename from drivers/isdn/gigaset/bas-gigaset.c
rename to drivers/staging/isdn/gigaset/bas-gigaset.c
diff --git a/drivers/isdn/gigaset/capi.c b/drivers/staging/isdn/gigaset/capi.c
similarity index 100%
rename from drivers/isdn/gigaset/capi.c
rename to drivers/staging/isdn/gigaset/capi.c
diff --git a/drivers/isdn/gigaset/common.c b/drivers/staging/isdn/gigaset/common.c
similarity index 100%
rename from drivers/isdn/gigaset/common.c
rename to drivers/staging/isdn/gigaset/common.c
diff --git a/drivers/isdn/gigaset/dummyll.c b/drivers/staging/isdn/gigaset/dummyll.c
similarity index 100%
rename from drivers/isdn/gigaset/dummyll.c
rename to drivers/staging/isdn/gigaset/dummyll.c
diff --git a/drivers/isdn/gigaset/ev-layer.c b/drivers/staging/isdn/gigaset/ev-layer.c
similarity index 100%
rename from drivers/isdn/gigaset/ev-layer.c
rename to drivers/staging/isdn/gigaset/ev-layer.c
diff --git a/drivers/isdn/gigaset/gigaset.h b/drivers/staging/isdn/gigaset/gigaset.h
similarity index 100%
rename from drivers/isdn/gigaset/gigaset.h
rename to drivers/staging/isdn/gigaset/gigaset.h
diff --git a/drivers/isdn/gigaset/interface.c b/drivers/staging/isdn/gigaset/interface.c
similarity index 100%
rename from drivers/isdn/gigaset/interface.c
rename to drivers/staging/isdn/gigaset/interface.c
diff --git a/drivers/isdn/gigaset/isocdata.c b/drivers/staging/isdn/gigaset/isocdata.c
similarity index 100%
rename from drivers/isdn/gigaset/isocdata.c
rename to drivers/staging/isdn/gigaset/isocdata.c
diff --git a/drivers/isdn/gigaset/proc.c b/drivers/staging/isdn/gigaset/proc.c
similarity index 100%
rename from drivers/isdn/gigaset/proc.c
rename to drivers/staging/isdn/gigaset/proc.c
diff --git a/drivers/isdn/gigaset/ser-gigaset.c b/drivers/staging/isdn/gigaset/ser-gigaset.c
similarity index 100%
rename from drivers/isdn/gigaset/ser-gigaset.c
rename to drivers/staging/isdn/gigaset/ser-gigaset.c
diff --git a/drivers/isdn/gigaset/usb-gigaset.c b/drivers/staging/isdn/gigaset/usb-gigaset.c
similarity index 100%
rename from drivers/isdn/gigaset/usb-gigaset.c
rename to drivers/staging/isdn/gigaset/usb-gigaset.c
diff --git a/drivers/isdn/hysdn/Kconfig b/drivers/staging/isdn/hysdn/Kconfig
similarity index 100%
rename from drivers/isdn/hysdn/Kconfig
rename to drivers/staging/isdn/hysdn/Kconfig
diff --git a/drivers/isdn/hysdn/Makefile b/drivers/staging/isdn/hysdn/Makefile
similarity index 100%
rename from drivers/isdn/hysdn/Makefile
rename to drivers/staging/isdn/hysdn/Makefile
diff --git a/drivers/isdn/hysdn/boardergo.c b/drivers/staging/isdn/hysdn/boardergo.c
similarity index 100%
rename from drivers/isdn/hysdn/boardergo.c
rename to drivers/staging/isdn/hysdn/boardergo.c
diff --git a/drivers/isdn/hysdn/boardergo.h b/drivers/staging/isdn/hysdn/boardergo.h
similarity index 100%
rename from drivers/isdn/hysdn/boardergo.h
rename to drivers/staging/isdn/hysdn/boardergo.h
diff --git a/drivers/isdn/hysdn/hycapi.c b/drivers/staging/isdn/hysdn/hycapi.c
similarity index 100%
rename from drivers/isdn/hysdn/hycapi.c
rename to drivers/staging/isdn/hysdn/hycapi.c
diff --git a/drivers/isdn/hysdn/hysdn_boot.c b/drivers/staging/isdn/hysdn/hysdn_boot.c
similarity index 100%
rename from drivers/isdn/hysdn/hysdn_boot.c
rename to drivers/staging/isdn/hysdn/hysdn_boot.c
diff --git a/drivers/isdn/hysdn/hysdn_defs.h b/drivers/staging/isdn/hysdn/hysdn_defs.h
similarity index 100%
rename from drivers/isdn/hysdn/hysdn_defs.h
rename to drivers/staging/isdn/hysdn/hysdn_defs.h
diff --git a/drivers/isdn/hysdn/hysdn_init.c b/drivers/staging/isdn/hysdn/hysdn_init.c
similarity index 100%
rename from drivers/isdn/hysdn/hysdn_init.c
rename to drivers/staging/isdn/hysdn/hysdn_init.c
diff --git a/drivers/isdn/hysdn/hysdn_net.c b/drivers/staging/isdn/hysdn/hysdn_net.c
similarity index 100%
rename from drivers/isdn/hysdn/hysdn_net.c
rename to drivers/staging/isdn/hysdn/hysdn_net.c
diff --git a/drivers/isdn/hysdn/hysdn_pof.h b/drivers/staging/isdn/hysdn/hysdn_pof.h
similarity index 100%
rename from drivers/isdn/hysdn/hysdn_pof.h
rename to drivers/staging/isdn/hysdn/hysdn_pof.h
diff --git a/drivers/isdn/hysdn/hysdn_procconf.c b/drivers/staging/isdn/hysdn/hysdn_procconf.c
similarity index 100%
rename from drivers/isdn/hysdn/hysdn_procconf.c
rename to drivers/staging/isdn/hysdn/hysdn_procconf.c
diff --git a/drivers/isdn/hysdn/hysdn_proclog.c b/drivers/staging/isdn/hysdn/hysdn_proclog.c
similarity index 100%
rename from drivers/isdn/hysdn/hysdn_proclog.c
rename to drivers/staging/isdn/hysdn/hysdn_proclog.c
diff --git a/drivers/isdn/hysdn/hysdn_sched.c b/drivers/staging/isdn/hysdn/hysdn_sched.c
similarity index 100%
rename from drivers/isdn/hysdn/hysdn_sched.c
rename to drivers/staging/isdn/hysdn/hysdn_sched.c
diff --git a/drivers/isdn/hysdn/ince1pc.h b/drivers/staging/isdn/hysdn/ince1pc.h
similarity index 100%
rename from drivers/isdn/hysdn/ince1pc.h
rename to drivers/staging/isdn/hysdn/ince1pc.h
-- 
2.20.0


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* Re: [PATCH v2 1/5] isdn: gigaset: remove i4l support
  2019-04-26 19:58 ` [PATCH v2 1/5] isdn: gigaset: remove i4l support Arnd Bergmann
@ 2019-04-28  2:04   ` David Miller
  2019-04-28  9:27     ` Arnd Bergmann
  0 siblings, 1 reply; 12+ messages in thread
From: David Miller @ 2019-04-28  2:04 UTC (permalink / raw)
  To: arnd
  Cc: netdev, isdn4linux, isdn, pebolle, holgerschurig, tilman, viro,
	gigaset307x-common, thomas.jarosch, WIMPy

From: Arnd Bergmann <arnd@arndb.de>
Date: Fri, 26 Apr 2019 21:58:45 +0200

> 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>

Arnd, I have no idea what I'm doing wrong, but the same thing is happening
as with v1 and I can't apply this.

Just take this single patch #1, for example, and go:

git am --signoff diff

And I keep getting things like:

Applying: isdn: gigaset: remove i4l support
error: removal patch leaves file contents
error: drivers/isdn/gigaset/i4l.c: patch does not apply
Patch failed at 0001 isdn: gigaset: remove i4l support
hint: Use 'git am --show-current-patch' to see the failed patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

Help!

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PATCH v2 1/5] isdn: gigaset: remove i4l support
  2019-04-28  2:04   ` David Miller
@ 2019-04-28  9:27     ` Arnd Bergmann
  0 siblings, 0 replies; 12+ messages in thread
From: Arnd Bergmann @ 2019-04-28  9:27 UTC (permalink / raw)
  To: David Miller
  Cc: Networking, isdn4linux, Karsten Keil, Paul Bolle, Holger Schurig,
	Tilman Schmidt, Al Viro, gigaset307x-common, Thomas Jarosch,
	Birger Harzenetter

On Sun, Apr 28, 2019 at 4:05 AM David Miller <davem@davemloft.net> wrote:
>
> And I keep getting things like:
>
> Applying: isdn: gigaset: remove i4l support
> error: removal patch leaves file contents
> error: drivers/isdn/gigaset/i4l.c: patch does not apply
> Patch failed at 0001 isdn: gigaset: remove i4l support
> hint: Use 'git am --show-current-patch' to see the failed patch
> When you have resolved this problem, run "git am --continue".
> If you prefer to skip this patch, run "git am --skip" instead.
> To restore the original branch and stop patching, run "git am --abort".

This must be a result of me sending the file removals as generated
by 'git format-patch -D -M'. Including the file contents would make them
too large for the mailing lists I assume.

Here is a pull request instead:
-----------
The following changes since commit b1a79360ee862f8ada4798ad2346fa45bb41b527:

  cxgb4: Delete all hash and TCAM filters before resource cleanup
(2019-04-27 22:25:37 -0400)

are available in the Git repository at:

  https://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground.git
tags/isdn-removal

for you to fetch changes up to fa6011c3ad97ed6a7957a4031ae6048981a7a015:

  isdn: move capi drivers to staging (2019-04-28 11:22:17 +0200)

----------------------------------------------------------------
isdn: deprecate non-mISDN drivers

When isdn4linux came up in the context of another patch series, I
remembered that we had discussed removing it a while ago.

It turns out that the suggestion from Karsten Keil wa to remove I4L
in 2018 after the last public ISDN networks are shut down. This has
happened now (with a very small number of exceptions), so I guess it's
time to try again.

We currently have three ISDN stacks in the kernel: the original
isdn4linux (with the hisax driver), the newer CAPI (with four drivers),
and finally the mISDN stack (supporting roughly the same hardware as
hisax).

As far as I can tell, anyone using ISDN with mainline kernel drivers in
the past few years uses mISDN, and this is typically used for voice-only
PBX installations that don't require a public network.

The older stacks support additional features for data networks, but those
typically make no sense any more if there is no network to connect to.

My proposal for this time is to kill off isdn4linux entirely, as it seems
to have been unusable for quite a while. This code has been abandoned
for many years and it does cause problems for treewide maintenance as
it tends to do everything that we try to stop doing.
Birger Harzenetter mentioned that is is still using i4l in order to
make use of the 'divert' feature that is not part of mISDN, but has
otherwise moved on to mISDN for normal operation, like apparently
everyone else.

CAPI in turn is not quite as obsolete, but two of the drivers (avm
and hysdn) don't seem to be used at all, while another one (gigaset)
will stop being maintained as Paul Bolle is no longer able to
test it after the network gets shut down in September.
All three are now moved into drivers/staging to let others speak
up in case there are remaining users.
This leaves Bluetooth CMTP as the only remaining user of CAPI, but
Marcel Holtmann wishes to keep maintaining it.

For the discussion on version 1, see [2]
Unfortunately, Karsten Keil as the maintainer has not participated in
the discussion.

      Arnd

[1] https://patchwork.kernel.org/patch/8484861/#17900371
[2] https://listserv.isdn4linux.de/pipermail/isdn4linux/2019-April/thread.html

----------------------------------------------------------------
Arnd Bergmann (5):
      isdn: gigaset: remove i4l support
      isdn: remove hisax driver
      isdn: remove isdn4linux
      isdn: hdlc: move into mISDN
      isdn: move capi drivers to staging

 Documentation/isdn/HiSax.cert                      |   96 -
 Documentation/isdn/INTERFACE                       |  759 ----
 Documentation/isdn/INTERFACE.fax                   |  163 -
 Documentation/isdn/README                          |  599 ----
 Documentation/isdn/README.FAQ                      |   26 -
 Documentation/isdn/README.HiSax                    |  659 ----
 Documentation/isdn/README.audio                    |  138 -
 Documentation/isdn/README.concap                   |  259 --
 Documentation/isdn/README.diversion                |  127 -
 Documentation/isdn/README.fax                      |   45 -
 Documentation/isdn/README.gigaset                  |   36 +-
 Documentation/isdn/README.hfc-pci                  |   41 -
 Documentation/isdn/README.syncppp                  |   58 -
 Documentation/isdn/README.x25                      |  184 -
 Documentation/isdn/syncPPP.FAQ                     |  224 --
 Documentation/process/changes.rst                  |   16 +-
 MAINTAINERS                                        |   22 +-
 drivers/isdn/Kconfig                               |   51 -
 drivers/isdn/Makefile                              |    6 -
 drivers/isdn/capi/Kconfig                          |   29 +-
 drivers/isdn/capi/Makefile                         |    2 +
 drivers/isdn/capi/capidrv.c                        | 2525 -------------
 drivers/isdn/capi/capidrv.h                        |  140 -
 drivers/isdn/divert/Makefile                       |    9 -
 drivers/isdn/divert/divert_init.c                  |   82 -
 drivers/isdn/divert/divert_procfs.c                |  336 --
 drivers/isdn/divert/isdn_divert.c                  |  846 -----
 drivers/isdn/divert/isdn_divert.h                  |  132 -
 drivers/isdn/gigaset/i4l.c                         |  695 ----
 drivers/isdn/hardware/Kconfig                      |    7 -
 drivers/isdn/hardware/Makefile                     |    1 -
 drivers/isdn/hardware/mISDN/Kconfig                |    7 +-
 drivers/isdn/hardware/mISDN/Makefile               |    2 +
 drivers/isdn/{i4l => hardware/mISDN}/isdnhdlc.c    |    2 +-
 .../isdn/hardware/mISDN/isdnhdlc.h                 |    0
 drivers/isdn/hardware/mISDN/netjet.c               |    2 +-
 drivers/isdn/hisax/Kconfig                         |  422 ---
 drivers/isdn/hisax/Makefile                        |   60 -
 drivers/isdn/hisax/amd7930_fn.c                    |  794 -----
 drivers/isdn/hisax/amd7930_fn.h                    |   37 -
 drivers/isdn/hisax/arcofi.c                        |  131 -
 drivers/isdn/hisax/arcofi.h                        |   27 -
 drivers/isdn/hisax/asuscom.c                       |  423 ---
 drivers/isdn/hisax/avm_a1.c                        |  307 --
 drivers/isdn/hisax/avm_a1p.c                       |  267 --
 drivers/isdn/hisax/avm_pci.c                       |  904 -----
 drivers/isdn/hisax/avma1_cs.c                      |  162 -
 drivers/isdn/hisax/bkm_a4t.c                       |  358 --
 drivers/isdn/hisax/bkm_a8.c                        |  433 ---
 drivers/isdn/hisax/bkm_ax.h                        |  119 -
 drivers/isdn/hisax/callc.c                         | 1792 ----------
 drivers/isdn/hisax/config.c                        | 1993 -----------
 drivers/isdn/hisax/diva.c                          | 1282 -------
 drivers/isdn/hisax/elsa.c                          | 1245 -------
 drivers/isdn/hisax/elsa_cs.c                       |  218 --
 drivers/isdn/hisax/elsa_ser.c                      |  659 ----
 drivers/isdn/hisax/enternow_pci.c                  |  420 ---
 drivers/isdn/hisax/fsm.c                           |  161 -
 drivers/isdn/hisax/fsm.h                           |   61 -
 drivers/isdn/hisax/gazel.c                         |  691 ----
 drivers/isdn/hisax/hfc4s8s_l1.c                    | 1584 ---------
 drivers/isdn/hisax/hfc4s8s_l1.h                    |   89 -
 drivers/isdn/hisax/hfc_2bds0.c                     | 1078 ------
 drivers/isdn/hisax/hfc_2bds0.h                     |  128 -
 drivers/isdn/hisax/hfc_2bs0.c                      |  591 ---
 drivers/isdn/hisax/hfc_2bs0.h                      |   60 -
 drivers/isdn/hisax/hfc_pci.c                       | 1755 ---------
 drivers/isdn/hisax/hfc_pci.h                       |  235 --
 drivers/isdn/hisax/hfc_sx.c                        | 1517 --------
 drivers/isdn/hisax/hfc_sx.h                        |  196 -
 drivers/isdn/hisax/hfc_usb.c                       | 1608 ---------
 drivers/isdn/hisax/hfc_usb.h                       |  208 --
 drivers/isdn/hisax/hfcscard.c                      |  261 --
 drivers/isdn/hisax/hisax.h                         | 1352 -------
 drivers/isdn/hisax/hisax_cfg.h                     |   66 -
 drivers/isdn/hisax/hisax_debug.h                   |   80 -
 drivers/isdn/hisax/hisax_fcpcipnp.c                | 1024 ------
 drivers/isdn/hisax/hisax_fcpcipnp.h                |   58 -
 drivers/isdn/hisax/hisax_if.h                      |   66 -
 drivers/isdn/hisax/hisax_isac.c                    |  895 -----
 drivers/isdn/hisax/hisax_isac.h                    |   46 -
 drivers/isdn/hisax/hscx.c                          |  277 --
 drivers/isdn/hisax/hscx.h                          |   41 -
 drivers/isdn/hisax/hscx_irq.c                      |  294 --
 drivers/isdn/hisax/icc.c                           |  680 ----
 drivers/isdn/hisax/icc.h                           |   72 -
 drivers/isdn/hisax/ipac.h                          |   29 -
 drivers/isdn/hisax/ipacx.c                         |  913 -----
 drivers/isdn/hisax/ipacx.h                         |  162 -
 drivers/isdn/hisax/isac.c                          |  681 ----
 drivers/isdn/hisax/isac.h                          |   70 -
 drivers/isdn/hisax/isar.c                          | 1910 ----------
 drivers/isdn/hisax/isar.h                          |  222 --
 drivers/isdn/hisax/isdnl1.c                        |  930 -----
 drivers/isdn/hisax/isdnl1.h                        |   32 -
 drivers/isdn/hisax/isdnl2.c                        | 1839 ----------
 drivers/isdn/hisax/isdnl2.h                        |   25 -
 drivers/isdn/hisax/isdnl3.c                        |  594 ----
 drivers/isdn/hisax/isdnl3.h                        |   42 -
 drivers/isdn/hisax/isurf.c                         |  305 --
 drivers/isdn/hisax/ix1_micro.c                     |  316 --
 drivers/isdn/hisax/jade.c                          |  305 --
 drivers/isdn/hisax/jade.h                          |  134 -
 drivers/isdn/hisax/jade_irq.c                      |  238 --
 drivers/isdn/hisax/l3_1tr6.c                       |  932 -----
 drivers/isdn/hisax/l3_1tr6.h                       |  164 -
 drivers/isdn/hisax/l3dss1.c                        | 3227 -----------------
 drivers/isdn/hisax/l3dss1.h                        |  124 -
 drivers/isdn/hisax/l3ni1.c                         | 3182 -----------------
 drivers/isdn/hisax/l3ni1.h                         |  136 -
 drivers/isdn/hisax/lmgr.c                          |   50 -
 drivers/isdn/hisax/mic.c                           |  235 --
 drivers/isdn/hisax/netjet.c                        |  985 -----
 drivers/isdn/hisax/netjet.h                        |   69 -
 drivers/isdn/hisax/niccy.c                         |  380 --
 drivers/isdn/hisax/nj_s.c                          |  294 --
 drivers/isdn/hisax/nj_u.c                          |  258 --
 drivers/isdn/hisax/q931.c                          | 1513 --------
 drivers/isdn/hisax/s0box.c                         |  260 --
 drivers/isdn/hisax/saphir.c                        |  296 --
 drivers/isdn/hisax/sedlbauer.c                     |  873 -----
 drivers/isdn/hisax/sedlbauer_cs.c                  |  209 --
 drivers/isdn/hisax/sportster.c                     |  267 --
 drivers/isdn/hisax/st5481.h                        |  529 ---
 drivers/isdn/hisax/st5481_b.c                      |  380 --
 drivers/isdn/hisax/st5481_d.c                      |  780 ----
 drivers/isdn/hisax/st5481_init.c                   |  221 --
 drivers/isdn/hisax/st5481_usb.c                    |  659 ----
 drivers/isdn/hisax/tei.c                           |  465 ---
 drivers/isdn/hisax/teleint.c                       |  334 --
 drivers/isdn/hisax/teles0.c                        |  364 --
 drivers/isdn/hisax/teles3.c                        |  498 ---
 drivers/isdn/hisax/teles_cs.c                      |  200 --
 drivers/isdn/hisax/telespci.c                      |  349 --
 drivers/isdn/hisax/w6692.c                         | 1085 ------
 drivers/isdn/hisax/w6692.h                         |  184 -
 drivers/isdn/i4l/Kconfig                           |  128 -
 drivers/isdn/i4l/Makefile                          |   20 -
 drivers/isdn/i4l/isdn_audio.c                      |  711 ----
 drivers/isdn/i4l/isdn_audio.h                      |   44 -
 drivers/isdn/i4l/isdn_bsdcomp.c                    |  930 -----
 drivers/isdn/i4l/isdn_common.c                     | 2368 ------------
 drivers/isdn/i4l/isdn_common.h                     |   47 -
 drivers/isdn/i4l/isdn_concap.c                     |   99 -
 drivers/isdn/i4l/isdn_concap.h                     |   11 -
 drivers/isdn/i4l/isdn_net.c                        | 3198 -----------------
 drivers/isdn/i4l/isdn_net.h                        |  151 -
 drivers/isdn/i4l/isdn_ppp.c                        | 3046 ----------------
 drivers/isdn/i4l/isdn_ppp.h                        |   41 -
 drivers/isdn/i4l/isdn_tty.c                        | 3756 --------------------
 drivers/isdn/i4l/isdn_tty.h                        |  120 -
 drivers/isdn/i4l/isdn_ttyfax.c                     | 1123 ------
 drivers/isdn/i4l/isdn_ttyfax.h                     |   17 -
 drivers/isdn/i4l/isdn_v110.c                       |  625 ----
 drivers/isdn/i4l/isdn_v110.h                       |   29 -
 drivers/isdn/i4l/isdn_x25iface.c                   |  332 --
 drivers/isdn/i4l/isdn_x25iface.h                   |   30 -
 drivers/isdn/isdnloop/Makefile                     |    5 -
 drivers/isdn/isdnloop/isdnloop.c                   | 1528 --------
 drivers/isdn/isdnloop/isdnloop.h                   |  112 -
 drivers/staging/Kconfig                            |    2 +
 drivers/staging/Makefile                           |    1 +
 drivers/staging/isdn/Kconfig                       |   11 +
 drivers/staging/isdn/Makefile                      |    8 +
 drivers/staging/isdn/TODO                          |   22 +
 .../{isdn/hardware => staging/isdn}/avm/Kconfig    |    0
 .../{isdn/hardware => staging/isdn}/avm/Makefile   |    0
 .../{isdn/hardware => staging/isdn}/avm/avm_cs.c   |    0
 .../{isdn/hardware => staging/isdn}/avm/avmcard.h  |    0
 drivers/{isdn/hardware => staging/isdn}/avm/b1.c   |    0
 .../{isdn/hardware => staging/isdn}/avm/b1dma.c    |    0
 .../{isdn/hardware => staging/isdn}/avm/b1isa.c    |    0
 .../{isdn/hardware => staging/isdn}/avm/b1pci.c    |    0
 .../{isdn/hardware => staging/isdn}/avm/b1pcmcia.c |    0
 drivers/{isdn/hardware => staging/isdn}/avm/c4.c   |    0
 .../{isdn/hardware => staging/isdn}/avm/t1isa.c    |    0
 .../{isdn/hardware => staging/isdn}/avm/t1pci.c    |    0
 drivers/{ => staging}/isdn/gigaset/Kconfig         |    9 -
 drivers/{ => staging}/isdn/gigaset/Makefile        |   10 +-
 drivers/{ => staging}/isdn/gigaset/asyncdata.c     |    0
 drivers/{ => staging}/isdn/gigaset/bas-gigaset.c   |    0
 drivers/{ => staging}/isdn/gigaset/capi.c          |    0
 drivers/{ => staging}/isdn/gigaset/common.c        |    0
 drivers/{ => staging}/isdn/gigaset/dummyll.c       |    0
 drivers/{ => staging}/isdn/gigaset/ev-layer.c      |    0
 drivers/{ => staging}/isdn/gigaset/gigaset.h       |    0
 drivers/{ => staging}/isdn/gigaset/interface.c     |    0
 drivers/{ => staging}/isdn/gigaset/isocdata.c      |    0
 drivers/{ => staging}/isdn/gigaset/proc.c          |    0
 drivers/{ => staging}/isdn/gigaset/ser-gigaset.c   |    0
 drivers/{ => staging}/isdn/gigaset/usb-gigaset.c   |    0
 drivers/{ => staging}/isdn/hysdn/Kconfig           |    0
 drivers/{ => staging}/isdn/hysdn/Makefile          |    0
 drivers/{ => staging}/isdn/hysdn/boardergo.c       |    0
 drivers/{ => staging}/isdn/hysdn/boardergo.h       |    0
 drivers/{ => staging}/isdn/hysdn/hycapi.c          |    0
 drivers/{ => staging}/isdn/hysdn/hysdn_boot.c      |    0
 drivers/{ => staging}/isdn/hysdn/hysdn_defs.h      |    0
 drivers/{ => staging}/isdn/hysdn/hysdn_init.c      |    0
 drivers/{ => staging}/isdn/hysdn/hysdn_net.c       |    0
 drivers/{ => staging}/isdn/hysdn/hysdn_pof.h       |    0
 drivers/{ => staging}/isdn/hysdn/hysdn_procconf.c  |    0
 drivers/{ => staging}/isdn/hysdn/hysdn_proclog.c   |    0
 drivers/{ => staging}/isdn/hysdn/hysdn_sched.c     |    0
 drivers/{ => staging}/isdn/hysdn/ince1pc.h         |    0
 include/linux/concap.h                             |  112 -
 include/linux/isdn.h                               |  473 ---
 include/linux/isdn_divertif.h                      |   35 -
 include/linux/isdn_ppp.h                           |  194 -
 include/linux/isdnif.h                             |  505 ---
 include/linux/wanrouter.h                          |   11 -
 include/uapi/linux/isdn.h                          |  144 -
 include/uapi/linux/isdn_divertif.h                 |   31 -
 include/uapi/linux/isdn_ppp.h                      |   68 -
 include/uapi/linux/isdnif.h                        |   57 -
 include/uapi/linux/wanrouter.h                     |   18 -
 216 files changed, 106 insertions(+), 83878 deletions(-)
 delete mode 100644 Documentation/isdn/HiSax.cert
 delete mode 100644 Documentation/isdn/INTERFACE
 delete mode 100644 Documentation/isdn/INTERFACE.fax
 delete mode 100644 Documentation/isdn/README
 delete mode 100644 Documentation/isdn/README.FAQ
 delete mode 100644 Documentation/isdn/README.HiSax
 delete mode 100644 Documentation/isdn/README.audio
 delete mode 100644 Documentation/isdn/README.concap
 delete mode 100644 Documentation/isdn/README.diversion
 delete mode 100644 Documentation/isdn/README.fax
 delete mode 100644 Documentation/isdn/README.hfc-pci
 delete mode 100644 Documentation/isdn/README.syncppp
 delete mode 100644 Documentation/isdn/README.x25
 delete mode 100644 Documentation/isdn/syncPPP.FAQ
 delete mode 100644 drivers/isdn/capi/capidrv.c
 delete mode 100644 drivers/isdn/capi/capidrv.h
 delete mode 100644 drivers/isdn/divert/Makefile
 delete mode 100644 drivers/isdn/divert/divert_init.c
 delete mode 100644 drivers/isdn/divert/divert_procfs.c
 delete mode 100644 drivers/isdn/divert/isdn_divert.c
 delete mode 100644 drivers/isdn/divert/isdn_divert.h
 delete mode 100644 drivers/isdn/gigaset/i4l.c
 delete mode 100644 drivers/isdn/hardware/Kconfig
 rename drivers/isdn/{i4l => hardware/mISDN}/isdnhdlc.c (99%)
 rename include/linux/isdn/hdlc.h =>
drivers/isdn/hardware/mISDN/isdnhdlc.h (100%)
 delete mode 100644 drivers/isdn/hisax/Kconfig
 delete mode 100644 drivers/isdn/hisax/Makefile
 delete mode 100644 drivers/isdn/hisax/amd7930_fn.c
 delete mode 100644 drivers/isdn/hisax/amd7930_fn.h
 delete mode 100644 drivers/isdn/hisax/arcofi.c
 delete mode 100644 drivers/isdn/hisax/arcofi.h
 delete mode 100644 drivers/isdn/hisax/asuscom.c
 delete mode 100644 drivers/isdn/hisax/avm_a1.c
 delete mode 100644 drivers/isdn/hisax/avm_a1p.c
 delete mode 100644 drivers/isdn/hisax/avm_pci.c
 delete mode 100644 drivers/isdn/hisax/avma1_cs.c
 delete mode 100644 drivers/isdn/hisax/bkm_a4t.c
 delete mode 100644 drivers/isdn/hisax/bkm_a8.c
 delete mode 100644 drivers/isdn/hisax/bkm_ax.h
 delete mode 100644 drivers/isdn/hisax/callc.c
 delete mode 100644 drivers/isdn/hisax/config.c
 delete mode 100644 drivers/isdn/hisax/diva.c
 delete mode 100644 drivers/isdn/hisax/elsa.c
 delete mode 100644 drivers/isdn/hisax/elsa_cs.c
 delete mode 100644 drivers/isdn/hisax/elsa_ser.c
 delete mode 100644 drivers/isdn/hisax/enternow_pci.c
 delete mode 100644 drivers/isdn/hisax/fsm.c
 delete mode 100644 drivers/isdn/hisax/fsm.h
 delete mode 100644 drivers/isdn/hisax/gazel.c
 delete mode 100644 drivers/isdn/hisax/hfc4s8s_l1.c
 delete mode 100644 drivers/isdn/hisax/hfc4s8s_l1.h
 delete mode 100644 drivers/isdn/hisax/hfc_2bds0.c
 delete mode 100644 drivers/isdn/hisax/hfc_2bds0.h
 delete mode 100644 drivers/isdn/hisax/hfc_2bs0.c
 delete mode 100644 drivers/isdn/hisax/hfc_2bs0.h
 delete mode 100644 drivers/isdn/hisax/hfc_pci.c
 delete mode 100644 drivers/isdn/hisax/hfc_pci.h
 delete mode 100644 drivers/isdn/hisax/hfc_sx.c
 delete mode 100644 drivers/isdn/hisax/hfc_sx.h
 delete mode 100644 drivers/isdn/hisax/hfc_usb.c
 delete mode 100644 drivers/isdn/hisax/hfc_usb.h
 delete mode 100644 drivers/isdn/hisax/hfcscard.c
 delete mode 100644 drivers/isdn/hisax/hisax.h
 delete mode 100644 drivers/isdn/hisax/hisax_cfg.h
 delete mode 100644 drivers/isdn/hisax/hisax_debug.h
 delete mode 100644 drivers/isdn/hisax/hisax_fcpcipnp.c
 delete mode 100644 drivers/isdn/hisax/hisax_fcpcipnp.h
 delete mode 100644 drivers/isdn/hisax/hisax_if.h
 delete mode 100644 drivers/isdn/hisax/hisax_isac.c
 delete mode 100644 drivers/isdn/hisax/hisax_isac.h
 delete mode 100644 drivers/isdn/hisax/hscx.c
 delete mode 100644 drivers/isdn/hisax/hscx.h
 delete mode 100644 drivers/isdn/hisax/hscx_irq.c
 delete mode 100644 drivers/isdn/hisax/icc.c
 delete mode 100644 drivers/isdn/hisax/icc.h
 delete mode 100644 drivers/isdn/hisax/ipac.h
 delete mode 100644 drivers/isdn/hisax/ipacx.c
 delete mode 100644 drivers/isdn/hisax/ipacx.h
 delete mode 100644 drivers/isdn/hisax/isac.c
 delete mode 100644 drivers/isdn/hisax/isac.h
 delete mode 100644 drivers/isdn/hisax/isar.c
 delete mode 100644 drivers/isdn/hisax/isar.h
 delete mode 100644 drivers/isdn/hisax/isdnl1.c
 delete mode 100644 drivers/isdn/hisax/isdnl1.h
 delete mode 100644 drivers/isdn/hisax/isdnl2.c
 delete mode 100644 drivers/isdn/hisax/isdnl2.h
 delete mode 100644 drivers/isdn/hisax/isdnl3.c
 delete mode 100644 drivers/isdn/hisax/isdnl3.h
 delete mode 100644 drivers/isdn/hisax/isurf.c
 delete mode 100644 drivers/isdn/hisax/ix1_micro.c
 delete mode 100644 drivers/isdn/hisax/jade.c
 delete mode 100644 drivers/isdn/hisax/jade.h
 delete mode 100644 drivers/isdn/hisax/jade_irq.c
 delete mode 100644 drivers/isdn/hisax/l3_1tr6.c
 delete mode 100644 drivers/isdn/hisax/l3_1tr6.h
 delete mode 100644 drivers/isdn/hisax/l3dss1.c
 delete mode 100644 drivers/isdn/hisax/l3dss1.h
 delete mode 100644 drivers/isdn/hisax/l3ni1.c
 delete mode 100644 drivers/isdn/hisax/l3ni1.h
 delete mode 100644 drivers/isdn/hisax/lmgr.c
 delete mode 100644 drivers/isdn/hisax/mic.c
 delete mode 100644 drivers/isdn/hisax/netjet.c
 delete mode 100644 drivers/isdn/hisax/netjet.h
 delete mode 100644 drivers/isdn/hisax/niccy.c
 delete mode 100644 drivers/isdn/hisax/nj_s.c
 delete mode 100644 drivers/isdn/hisax/nj_u.c
 delete mode 100644 drivers/isdn/hisax/q931.c
 delete mode 100644 drivers/isdn/hisax/s0box.c
 delete mode 100644 drivers/isdn/hisax/saphir.c
 delete mode 100644 drivers/isdn/hisax/sedlbauer.c
 delete mode 100644 drivers/isdn/hisax/sedlbauer_cs.c
 delete mode 100644 drivers/isdn/hisax/sportster.c
 delete mode 100644 drivers/isdn/hisax/st5481.h
 delete mode 100644 drivers/isdn/hisax/st5481_b.c
 delete mode 100644 drivers/isdn/hisax/st5481_d.c
 delete mode 100644 drivers/isdn/hisax/st5481_init.c
 delete mode 100644 drivers/isdn/hisax/st5481_usb.c
 delete mode 100644 drivers/isdn/hisax/tei.c
 delete mode 100644 drivers/isdn/hisax/teleint.c
 delete mode 100644 drivers/isdn/hisax/teles0.c
 delete mode 100644 drivers/isdn/hisax/teles3.c
 delete mode 100644 drivers/isdn/hisax/teles_cs.c
 delete mode 100644 drivers/isdn/hisax/telespci.c
 delete mode 100644 drivers/isdn/hisax/w6692.c
 delete mode 100644 drivers/isdn/hisax/w6692.h
 delete mode 100644 drivers/isdn/i4l/Kconfig
 delete mode 100644 drivers/isdn/i4l/Makefile
 delete mode 100644 drivers/isdn/i4l/isdn_audio.c
 delete mode 100644 drivers/isdn/i4l/isdn_audio.h
 delete mode 100644 drivers/isdn/i4l/isdn_bsdcomp.c
 delete mode 100644 drivers/isdn/i4l/isdn_common.c
 delete mode 100644 drivers/isdn/i4l/isdn_common.h
 delete mode 100644 drivers/isdn/i4l/isdn_concap.c
 delete mode 100644 drivers/isdn/i4l/isdn_concap.h
 delete mode 100644 drivers/isdn/i4l/isdn_net.c
 delete mode 100644 drivers/isdn/i4l/isdn_net.h
 delete mode 100644 drivers/isdn/i4l/isdn_ppp.c
 delete mode 100644 drivers/isdn/i4l/isdn_ppp.h
 delete mode 100644 drivers/isdn/i4l/isdn_tty.c
 delete mode 100644 drivers/isdn/i4l/isdn_tty.h
 delete mode 100644 drivers/isdn/i4l/isdn_ttyfax.c
 delete mode 100644 drivers/isdn/i4l/isdn_ttyfax.h
 delete mode 100644 drivers/isdn/i4l/isdn_v110.c
 delete mode 100644 drivers/isdn/i4l/isdn_v110.h
 delete mode 100644 drivers/isdn/i4l/isdn_x25iface.c
 delete mode 100644 drivers/isdn/i4l/isdn_x25iface.h
 delete mode 100644 drivers/isdn/isdnloop/Makefile
 delete mode 100644 drivers/isdn/isdnloop/isdnloop.c
 delete mode 100644 drivers/isdn/isdnloop/isdnloop.h
 create mode 100644 drivers/staging/isdn/Kconfig
 create mode 100644 drivers/staging/isdn/Makefile
 create mode 100644 drivers/staging/isdn/TODO
 rename drivers/{isdn/hardware => staging/isdn}/avm/Kconfig (100%)
 rename drivers/{isdn/hardware => staging/isdn}/avm/Makefile (100%)
 rename drivers/{isdn/hardware => staging/isdn}/avm/avm_cs.c (100%)
 rename drivers/{isdn/hardware => staging/isdn}/avm/avmcard.h (100%)
 rename drivers/{isdn/hardware => staging/isdn}/avm/b1.c (100%)
 rename drivers/{isdn/hardware => staging/isdn}/avm/b1dma.c (100%)
 rename drivers/{isdn/hardware => staging/isdn}/avm/b1isa.c (100%)
 rename drivers/{isdn/hardware => staging/isdn}/avm/b1pci.c (100%)
 rename drivers/{isdn/hardware => staging/isdn}/avm/b1pcmcia.c (100%)
 rename drivers/{isdn/hardware => staging/isdn}/avm/c4.c (100%)
 rename drivers/{isdn/hardware => staging/isdn}/avm/t1isa.c (100%)
 rename drivers/{isdn/hardware => staging/isdn}/avm/t1pci.c (100%)
 rename drivers/{ => staging}/isdn/gigaset/Kconfig (91%)
 rename drivers/{ => staging}/isdn/gigaset/Makefile (74%)
 rename drivers/{ => staging}/isdn/gigaset/asyncdata.c (100%)
 rename drivers/{ => staging}/isdn/gigaset/bas-gigaset.c (100%)
 rename drivers/{ => staging}/isdn/gigaset/capi.c (100%)
 rename drivers/{ => staging}/isdn/gigaset/common.c (100%)
 rename drivers/{ => staging}/isdn/gigaset/dummyll.c (100%)
 rename drivers/{ => staging}/isdn/gigaset/ev-layer.c (100%)
 rename drivers/{ => staging}/isdn/gigaset/gigaset.h (100%)
 rename drivers/{ => staging}/isdn/gigaset/interface.c (100%)
 rename drivers/{ => staging}/isdn/gigaset/isocdata.c (100%)
 rename drivers/{ => staging}/isdn/gigaset/proc.c (100%)
 rename drivers/{ => staging}/isdn/gigaset/ser-gigaset.c (100%)
 rename drivers/{ => staging}/isdn/gigaset/usb-gigaset.c (100%)
 rename drivers/{ => staging}/isdn/hysdn/Kconfig (100%)
 rename drivers/{ => staging}/isdn/hysdn/Makefile (100%)
 rename drivers/{ => staging}/isdn/hysdn/boardergo.c (100%)
 rename drivers/{ => staging}/isdn/hysdn/boardergo.h (100%)
 rename drivers/{ => staging}/isdn/hysdn/hycapi.c (100%)
 rename drivers/{ => staging}/isdn/hysdn/hysdn_boot.c (100%)
 rename drivers/{ => staging}/isdn/hysdn/hysdn_defs.h (100%)
 rename drivers/{ => staging}/isdn/hysdn/hysdn_init.c (100%)
 rename drivers/{ => staging}/isdn/hysdn/hysdn_net.c (100%)
 rename drivers/{ => staging}/isdn/hysdn/hysdn_pof.h (100%)
 rename drivers/{ => staging}/isdn/hysdn/hysdn_procconf.c (100%)
 rename drivers/{ => staging}/isdn/hysdn/hysdn_proclog.c (100%)
 rename drivers/{ => staging}/isdn/hysdn/hysdn_sched.c (100%)
 rename drivers/{ => staging}/isdn/hysdn/ince1pc.h (100%)
 delete mode 100644 include/linux/concap.h
 delete mode 100644 include/linux/isdn.h
 delete mode 100644 include/linux/isdn_divertif.h
 delete mode 100644 include/linux/isdn_ppp.h
 delete mode 100644 include/linux/isdnif.h
 delete mode 100644 include/linux/wanrouter.h
 delete mode 100644 include/uapi/linux/isdn.h
 delete mode 100644 include/uapi/linux/isdn_divertif.h
 delete mode 100644 include/uapi/linux/isdn_ppp.h
 delete mode 100644 include/uapi/linux/isdnif.h
 delete mode 100644 include/uapi/linux/wanrouter.h

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PATCH v2 5/5] isdn: move capi drivers to staging
  2019-04-26 19:58 ` [PATCH v2 5/5] isdn: move capi drivers to staging Arnd Bergmann
@ 2021-11-08  9:48   ` Thomas Jarosch
  2021-11-08 10:58     ` Arnd Bergmann
  0 siblings, 1 reply; 12+ messages in thread
From: Thomas Jarosch @ 2021-11-08  9:48 UTC (permalink / raw)
  To: Arnd Bergmann
  Cc: netdev, Tilman Schmidt, Karsten Keil, gigaset307x-common,
	Marcel Holtmann, Paul Bolle, isdn4linux, Al Viro, Holger Schurig

Hi Arnd,

You wrote on Fri, Apr 26, 2019 at 09:58:49PM +0200:
> I tried to find any indication of whether the capi drivers are still in
> use, and have not found anything from a long time ago.
> 
> With public ISDN networks almost completely shut down over the past 12
> months, there is very little you can actually do with this hardware. The
> main remaining use case would be to connect ISDN voice phones to an
> in-house installation with Asterisk or LCR, but anyone trying this in
> turn seems to be using either the mISDN driver stack, or out-of-tree
> drivers from the hardware vendors.
> 
> I may of course have missed something, so I would suggest moving these
> three drivers (avm, hysdn, gigaset) into drivers/staging/ just in case
> someone still uses them.
> 
> If nobody complains, we can remove them entirely in six months, or
> otherwise move the core code and any drivers that are still needed back
> into drivers/isdn.

just a quick follow up on this one: Intra2net is officially
removing ISDN fax support from our distribution on 2022-06-30.

Since we are still running on kernel 4.19 and plan on upgrading to 5.10 some day 
soonish, there's one less ISDN user to care about in future kernel maintenance.

This makes me even wonder how many linux ISDN users are left these days.

Cheers,
Thomas

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PATCH v2 5/5] isdn: move capi drivers to staging
  2021-11-08  9:48   ` Thomas Jarosch
@ 2021-11-08 10:58     ` Arnd Bergmann
  2021-11-08 12:50       ` Harald Welte
       [not found]       ` <977673e5-57ea-1977-65fe-963e88f5da7a@eversberg.eu>
  0 siblings, 2 replies; 12+ messages in thread
From: Arnd Bergmann @ 2021-11-08 10:58 UTC (permalink / raw)
  To: Thomas Jarosch
  Cc: Arnd Bergmann, Networking, Tilman Schmidt, Karsten Keil,
	gigaset307x-common, Marcel Holtmann, Paul Bolle, isdn4linux,
	Al Viro, Holger Schurig, Harald Welte

On Mon, Nov 8, 2021 at 10:48 AM Thomas Jarosch
<thomas.jarosch@intra2net.com> wrote:
> You wrote on Fri, Apr 26, 2019 at 09:58:49PM +0200:
> > I tried to find any indication of whether the capi drivers are still in
> > use, and have not found anything from a long time ago.
> >
> > With public ISDN networks almost completely shut down over the past 12
> > months, there is very little you can actually do with this hardware. The
> > main remaining use case would be to connect ISDN voice phones to an
> > in-house installation with Asterisk or LCR, but anyone trying this in
> > turn seems to be using either the mISDN driver stack, or out-of-tree
> > drivers from the hardware vendors.
> >
> > I may of course have missed something, so I would suggest moving these
> > three drivers (avm, hysdn, gigaset) into drivers/staging/ just in case
> > someone still uses them.
> >
> > If nobody complains, we can remove them entirely in six months, or
> > otherwise move the core code and any drivers that are still needed back
> > into drivers/isdn.
>
> just a quick follow up on this one: Intra2net is officially
> removing ISDN fax support from our distribution on 2022-06-30.
>
> Since we are still running on kernel 4.19 and plan on upgrading to 5.10 some day
> soonish, there's one less ISDN user to care about in future kernel maintenance.
>
> This makes me even wonder how many linux ISDN users are left these days.

isdn4linux was already removed from the kernel as planned above.

I'm fairly sure the bluetooth capi/cmtp support can just be removed, it
seems to only cause security holes as recently discussed, and is otherwise
fairly useless, but Marcel still wanted to keep it as part of the bluetooth
stack. If this is still the case, we could consider merging all of
drivers/isdn/capi/ into net/bluetooth/cmtp/.

When removal of mISDN came up last, Harald Welte mentioned that some
of the code is still used by Osmocom/OpenBSC[1] to drive the E1 line cards.
I'm not sure if this is still the case, of if they have since migrated
to another
driver.

I see that Karsten's external mISDN modules were last updated for
v5.4 and don't build with newer kernels because of trivial interface changes.

      Arnd

[1] https://osmocom.org/projects/openbsc/wiki/MISDN
[2] https://github.com/ISDN4Linux/mISDN

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PATCH v2 5/5] isdn: move capi drivers to staging
  2021-11-08 10:58     ` Arnd Bergmann
@ 2021-11-08 12:50       ` Harald Welte
       [not found]       ` <977673e5-57ea-1977-65fe-963e88f5da7a@eversberg.eu>
  1 sibling, 0 replies; 12+ messages in thread
From: Harald Welte @ 2021-11-08 12:50 UTC (permalink / raw)
  To: Arnd Bergmann
  Cc: Thomas Jarosch, Networking, Tilman Schmidt, Karsten Keil,
	gigaset307x-common, Marcel Holtmann, Paul Bolle, isdn4linux,
	Al Viro, Holger Schurig

Hi Arnd,

On Mon, Nov 08, 2021 at 11:58:23AM +0100, Arnd Bergmann wrote:
> When removal of mISDN came up last, Harald Welte mentioned that some
> of the code is still used by Osmocom/OpenBSC[1] to drive the E1 line cards.
> I'm not sure if this is still the case, of if they have since migrated
> to another driver.

In Osmocom (specifically, libosmo-abis which is used in osmo-bsc and
osmo-mgw) We currently support E1 interfaces via three drivers:

1) mISDN
2) DAHDI
3) our new open source hardware / gateware / firmware USB-E1 adapter icE1usb
   https://osmocom.org/projects/e1-t1-adapter/wiki/IcE1usb via the
   all-userspace libusb based driver osmo-e1d
   https://osmocom.org/projects/osmo-e1d/wiki/Wiki

The days of the use of TDM/E1 interface are also still far from over in
the cellular telecom operator industry - particularly so in
not-so-wealthy countries.  At my company we regularly have projects that
involve the requirement to drive E1 interfaces (typically 3GPP Abis, A and
Gb interface), even in 2021.

From my point of view, mISDN is certainly the least used driver at the
moment, given that [as far as I know] the only E1/PRI interface chipsets
it supports were for classic parallel PCI bus, which is hard to find
both in terms of E1 adapters as well as in mainboards.  Also, the cards
never supported more than 1 or 2 E1 ports, as far as I know.

I would expect the majority of the users are using DAHDI based
deployments (up to 8x E1 per PCIe slot), with some adventurous ones
requiring few portsgoing for our icE1usb.

I will inquire on the appropriate osmocom mailing list whether there are
people still using mISDN.

-- 
- Harald Welte <laforge@gnumonks.org>           http://laforge.gnumonks.org/
============================================================================
"Privacy in residential applications is a desirable marketing option."
                                                  (ETSI EN 300 175-7 Ch. A6)

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PATCH v2 5/5] isdn: move capi drivers to staging
       [not found]       ` <977673e5-57ea-1977-65fe-963e88f5da7a@eversberg.eu>
@ 2022-01-09 11:29         ` Arnd Bergmann
  0 siblings, 0 replies; 12+ messages in thread
From: Arnd Bergmann @ 2022-01-09 11:29 UTC (permalink / raw)
  To: Andreas Eversberg; +Cc: Arnd Bergmann, Networking, Karsten Keil

On Sun, Jan 9, 2022 at 10:42 AM Andreas Eversberg <andreas@eversberg.eu> wrote:
>
> Hi Arnd,
>
> first of all I want to introduce myself:
>
> I developed some drivers for the mISDN stack, like HFC-4S/8S/E1 cards and audio processing. I wrote LCR to make use of the mISDN stack and process ISDN voice calls. Later I worked on several GSM related Osmocom projects. My current effort is to preserve classic telecommunication technology[1].
>
> In my opinion, mISDN should stay in kernel. Connecting existing hardware PBX and terminal equipment (phones) requires BRI/PRI interfaces, which are provided by mISDN. Also telcos offer analog or BRI ports on their integrated access devices. LCR is not in development anymore, because the architecture is based on classic telephony, so that VoIP (SIP) supports basic speech calls with many limitations only. I actually don't like LCR it anymore. As a replacement for LCR, I wrote two gateway applications[2] that can interconnect SIP and mISDN endpoints without having something like a PBX. I know of some people still using mISDN/LCR (or the new gateway applications) to connect their equipment to a SIP provider. So there is still a use case.
>
> I have not been working on / compiling mISDN kernel drivers for a long time. If there is work to be done, let me know and I will look at it.

Hi Andreas,

There is of course no problem keeping it in the tree longer if it
still has users, but your
description above does not answer the two main questions:

- how likely are the remaining mISDN users to upgrade to a future
kernel using the
  provided mISDN stack, rather than remaining on the latest currently
working kernel
  or one of the out-of-tree copies of the driver [1][2].

- As Karsten Keil is no longer actively providing patches for mISDN
(his last mainline
  commit is from 2015, the last commit to [1] was in April 2020), is
there any other
  person who can take over as maintainer and actively work on ensuring that the
  drivers continue to work?

          Arnd

[1] https://github.com/ISDN4Linux/mISDN
[2] https://github.com/bbaranoff/mISDN

^ permalink raw reply	[flat|nested] 12+ messages in thread

end of thread, other threads:[~2022-01-09 11:29 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-04-26 19:58 [PATCH v2 0/5] isdn: deprecate non-mISDN drivers Arnd Bergmann
2019-04-26 19:58 ` [PATCH v2 1/5] isdn: gigaset: remove i4l support Arnd Bergmann
2019-04-28  2:04   ` David Miller
2019-04-28  9:27     ` Arnd Bergmann
2019-04-26 19:58 ` [PATCH v2 2/5] isdn: remove hisax driver Arnd Bergmann
2019-04-26 19:58 ` [PATCH v2 3/5] isdn: remove isdn4linux Arnd Bergmann
2019-04-26 19:58 ` [PATCH v2 4/5] isdn: hdlc: move into mISDN Arnd Bergmann
2019-04-26 19:58 ` [PATCH v2 5/5] isdn: move capi drivers to staging Arnd Bergmann
2021-11-08  9:48   ` Thomas Jarosch
2021-11-08 10:58     ` Arnd Bergmann
2021-11-08 12:50       ` Harald Welte
     [not found]       ` <977673e5-57ea-1977-65fe-963e88f5da7a@eversberg.eu>
2022-01-09 11:29         ` Arnd Bergmann

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.