From patchwork Fri Apr 26 19:58:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 162972 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp1145463jan; Fri, 26 Apr 2019 12:59:54 -0700 (PDT) X-Google-Smtp-Source: APXvYqwn7agmq9ls1GUpOa0fuUsRnVl7QeFF7SyYmeiIilMS4tL+L0HPzsJRrEFGShuO4UaoxVuR X-Received: by 2002:a17:902:2ec5:: with SMTP id r63mr4042928plb.139.1556308794450; Fri, 26 Apr 2019 12:59:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556308794; cv=none; d=google.com; s=arc-20160816; b=M+ttZ2JWHm4Cs8JRzvN59SqE9jqbJGiIyyEDWDOMdgX4PJ1T2e0DhzdOhB4v0YA3AV +v/kMAXF0xm8nbX63+SM8sYPq+N96Ip65oRR7VBV+06QK16geYgCoIFW5nKiGy/FQGvD DM1dDH5WaZxfjcgdRX0U5nO3DYozkSFcwk20ro9DekdG6F1ggGsVdbX1j1TkOUSpDzZF FtQfjTn7KAENcCWMNtFJZ3Zu6SgvtnqMzD7hhNJRWrSydxomllHYS2D4Ae/uJy1TynAk HQAzoaakDBQrI7woppZxRBGjJqjqJ6kmaO6oEalSk8kdcYxZOj4sdE+T+V8igLsCpSVR GWOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=279uK8Nlqas9+dWjVJ7McOkEUvS+A05pPmieJveBYOY=; b=yRjYVtJhNpyNRZe3mnxALAVgekYJS+xuAXl6f2O3jMDTpIPsETYdIF18epftGe1XBP KX6mI9giIi3WF5sot/dK42Adi6ePOk/UIi1lyp1Dgx358Na79Ey0BXbfJnH0dPuQxj72 3Uy1FhoDGm/wmjZm99Cdlq1RCCGUOvuqN7UKa4jHtpy6iG30lZDmHeSSwCspHx5++YX0 LOAcXa8YnXOjBNZMUlNwKkOiB8IK3o3mBxeQUtdV/k79/Juf6RLLUCaeqLvTChV/7lsT 8IIKVs/Bz30L3Y2e7RVelgA43GF01BLJ4BqnqIEGpNu6MQwO2c44zLAHsN3KQpnXk3FI CagA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of netdev-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id x18si3484640pff.280.2019.04.26.12.59.54; Fri, 26 Apr 2019 12:59:54 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of netdev-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of netdev-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726809AbfDZT7x (ORCPT + 9 others); Fri, 26 Apr 2019 15:59:53 -0400 Received: from mout.kundenserver.de ([217.72.192.73]:33185 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726734AbfDZT7w (ORCPT ); Fri, 26 Apr 2019 15:59:52 -0400 Received: from threadripper.lan ([149.172.19.189]) by mrelayeu.kundenserver.de (mreue108 [212.227.15.145]) with ESMTPA (Nemesis) id 1Mo73N-1gzcAV0f0N-00pdxb; Fri, 26 Apr 2019 21:58:56 +0200 From: Arnd Bergmann To: netdev@vger.kernel.org Cc: isdn4linux@listserv.isdn4linux.de, Karsten Keil , Paul Bolle , Holger Schurig , Tilman Schmidt , Al Viro , gigaset307x-common@lists.sourceforge.net, arnd@arndb.de, Thomas Jarosch , Birger Harzenetter Subject: [PATCH v2 1/5] isdn: gigaset: remove i4l support Date: Fri, 26 Apr 2019 21:58:45 +0200 Message-Id: <20190426195849.4111040-2-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 In-Reply-To: <20190426195849.4111040-1-arnd@arndb.de> References: <20190426195849.4111040-1-arnd@arndb.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:YIxyVJQYanhFH+Za4b+Xd8St4XLAzUSJKrRogZlMFNArt3c90Wj aYFbzvgBtO6r9qyp6F00d7KKctGDIrGfF08kb/Eg71yWYKXl2O9swUgH0VRbkMM5gaiH2eT s7ka246KqVmNb7LIviOlrJZ41wAmZHMvJwUqhUwP3w5dK5kqUGJ6HhEzUqSU7fvSjv3ivsV DEAo3X3KyUyihb3DDG5lQ== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:6UBS3gQ2Svs=:t4XiNTXPBzZ9PXPMqxyIMn J2F7YWFbTQ+aCcpVx8zWKroBd7+qsJ9TvOt9Sj5NVz49uD4tfQu1q2IZcS6/fSvo7Hxhh59wf F/5zHYpS8swKHBVs/Lt5KFSdVefKmRrMRwDy91yVI9LZ4Duv/UziffpAbZdILpgGQotAVk7BA S/qnfonK7DTSj3gd8Pf8lZL4NrFD61+kACN2C/FDiscaZziZeXIjXuKTBtD2BG9ZmpB717Bki CtIla79UfYOsodC9cM0rsr49+rHKgpd97pzuGQD4f0tTaymfkih/3MC6me/AyJVVwwZ8AWOgE CpkPUvnpu+MErmMC7lxBAde3VWm0TD4VbUS7gKdQ2XaWtuGNWuVxRZrZ5sSs+vytW8ETJswzq NQmWgRiAhXcLbrA7JjX0/jzoG/2/wD3rQGTc/cUoXNWFPANjnHO5JWGc1ExEGF2zlDqjAUMKV xmS9T4M0v/iVdWo5Z3Zg3vxGBBc6tZrCz/VSY/gyqjMFuIuLrSLGwFvzkJgIrZkxUROUlNhl+ TrBZOC92IXCspV32sNmVo1RFMN0+eZGVHXp/+3vjLeqYqNR+sp8Gax98M+h9NaIYUDIZhoM2R TMJhghdSQCo5//qbodd/xZDfGeF6TcW1FCnZoNLowrJ84car7bdsYX3JsSEuhSqSB4KNK3/fo GeJGN97jzvaqPKU8hf2BEJyvCXHWHZqccqf+fdDcB3cdK7t6/lYb6hgfWZ4fQOnZkRP6doWUM T09lIg6KP2nyFcFWvWovijIS68vvo5z5KJipsA== Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 --- 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/drivers/isdn/gigaset/i4l.c b/drivers/isdn/gigaset/i4l.c deleted file mode 100644 index b5b389e95edd..000000000000 -- 2.20.0 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 From patchwork Fri Apr 26 19:58:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 162973 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp1145496jan; Fri, 26 Apr 2019 12:59:57 -0700 (PDT) X-Google-Smtp-Source: APXvYqzmey0AuWQALoGPvOujd559YXNvD26NcXSppPPcgOtCPRf2vvi3xH2+4bJasmovut0BdI4K X-Received: by 2002:a63:700f:: with SMTP id l15mr46482647pgc.3.1556308797106; Fri, 26 Apr 2019 12:59:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556308797; cv=none; d=google.com; s=arc-20160816; b=CKPCC//pwAmp8KckFz6VNU0GLlDv+xSaWsCSU85A/s65bLxc7y6tZN3XW4z/O44beX 2hpfu7GCZ7ACFAotf84Bhxx2+Tvx6QicOYCSHVGwqmoHnvSWqXXUf61pbsf0IgzmPSwN n0ttjNLsrAaN6t1xeN2IXRNZ0K+/hnAmT04PXG+1+os3TYiiHVVp4ZkFUdHEURYZVQBU DxPw465R19R4AGyE6nHIHAQw7u6qQWsntMsDF500Wsrq2yBTeng6UI4RVa+zNLU83nKO 51h5KkYZpMaqI8oBNxdNHUDA2KLnpjWogJdHzMzLUyRMahNlleMadmxten0nJIuiQ7BR Amlw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=T4SzXibKFOfr0XKp0DtOw+vDYiAsWF0DNCG4eyNzXTg=; b=gZBUR4xf1oMCkZi4pN2KAS6zKRw9LXY6SuzehroM/Gc6yzH51fuQQqjUY+iEnwbcIi yDS7LB0gzMwGTdI2cSTJV8Fch4RTUr24KEEcXI37C5nSJkN84XzEmNSzizdPmOHQKcVw w9o1ehtlb4ppP5BjuCSElMQrQwCCd0gG8BiK0JHbYs6C6jhZQEYbPlU4kbzfkhmNpegs Pi17A5yQLyO5XCJWrYGPQLTQ/qAtj5Ku9KDarY9x84F/ZU/9XaUcePcj2iqv9vYpoyN+ cFDXpnpPLq3gAp6oQiDLzoHrC7nsOcJBK3NPPVmziAfmteWwqDJnNhuckcnHfVjIxTI2 py1w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of netdev-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id x18si3484640pff.280.2019.04.26.12.59.56; Fri, 26 Apr 2019 12:59:57 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of netdev-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of netdev-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726818AbfDZT7z (ORCPT + 9 others); Fri, 26 Apr 2019 15:59:55 -0400 Received: from mout.kundenserver.de ([212.227.17.24]:47335 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726754AbfDZT7y (ORCPT ); Fri, 26 Apr 2019 15:59:54 -0400 Received: from threadripper.lan ([149.172.19.189]) by mrelayeu.kundenserver.de (mreue108 [212.227.15.145]) with ESMTPA (Nemesis) id 1MGi2e-1hWk3m2IjK-00DpAg; Fri, 26 Apr 2019 21:58:56 +0200 From: Arnd Bergmann To: netdev@vger.kernel.org Cc: isdn4linux@listserv.isdn4linux.de, Karsten Keil , Paul Bolle , Holger Schurig , Tilman Schmidt , Al Viro , gigaset307x-common@lists.sourceforge.net, arnd@arndb.de, Thomas Jarosch , Birger Harzenetter Subject: [PATCH v2 2/5] isdn: remove hisax driver Date: Fri, 26 Apr 2019 21:58:46 +0200 Message-Id: <20190426195849.4111040-3-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 In-Reply-To: <20190426195849.4111040-1-arnd@arndb.de> References: <20190426195849.4111040-1-arnd@arndb.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:J8+nZPwWzn9C9Xbajw3hMdQptLuCxCN9LTQ7z5YPcblLN0ER8qY BPY4FqcYkdDxqO31er3uuBUCkvSN91EqlByFJehvJNIDdLUAe3mHe9HJJ/Q7BFLUX7I556s QW/g4mRzajGHg5il1ScnajjvJiK+JNuwcVROX2wTXKmtLYoRE+ZFDD6nBnkBxnM/MbU0nAE gAuGPKz8LA6+VqV4l66UQ== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:ifQTQ2Kwx14=:AD2H5ZnBIkYmYlODWv74Y2 UhGD22DGnNYRbp4rj/DnNMmJb+EUcRjAdl2r7dOVPCAaO1cT4YOX2586PJOZn5yCh8gKMEXVf YlZcA7DWrmQmYlKSoKbVdam4ap80aQhWR0a5pFGrgPiyM7eBL7kL6UsvYvSVUEUK+2blvIYOr x8djF2X+v8KQrWumuR86uI0qUk/lHbwZjQCF8r1eyW0a8CY9cSit3Mp4H9N8B8kyPd760z1Rr XnIOCCbagnLbdxKW05MrLKZFK7cbRENkJq7IMXcovz/0Wq7xxl1A5AtDHS59z0gvPXeKb3dgg 1ODTt5h7rvAP87lZdJ0+dgD5LOJv0XyjH5xbMZRWaXMPbfvUH6WNDUonHIsMcV5hRsG6O9Jvd R3X/bPokstPCDm6xe42+FrOOW0ABnj4SD+FranlzuaQxZ+e4l+wNg8mZVrhAcScl3pON4Mcz9 3kL2DHPAYPiyFPf0MOp/R+SWP8XER0k5LePBS5QvS5FuKkweF/3RPBDLPfb54BQFZFkVYz7Ou 1ztIcObpjK+6k2uKsOzElqFDD9dKBsH14cKAMgT7E26uWQ9RDnlkzWha6bp+fy0r1AkT1DzGC EIAIAORzvn528VE5ATUI3oC+M6u+rojLW2Q84kswdYakCVyoPR3YreQDVcvQfMsRTW1SjHGDg +vKpapSpTpdGcqUqyXf726n1yaYy52lfM1NDnEDyX5IZxa1uj5VNmrNcECbEZrh7fiV7XdD5Z C/eUhk3eY5cc3YPXIHhGkprx4O8sILOkQSVE5g== Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 Signed-off-by: Arnd Bergmann --- 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 -- 2.20.0 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 From patchwork Fri Apr 26 19:58:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 162969 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp1145108jan; Fri, 26 Apr 2019 12:59:27 -0700 (PDT) X-Google-Smtp-Source: APXvYqzCshbeqFdVNLg1WU1Ov474jNYprcR12ONwODv0sqMvj0ba6WxcpDybGgMlbbGAkiWWgGKB X-Received: by 2002:a62:e90d:: with SMTP id j13mr7620968pfh.42.1556308767016; Fri, 26 Apr 2019 12:59:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556308767; cv=none; d=google.com; s=arc-20160816; b=1JUhCXxCBIRbtgS9N8V2ez+A7HqOy/y0Jsel45mbw3fhzPk4eJkLT0NukSyTAKNer0 ACMnMdEX4T8ewHBq2P6PtFWIJVC44JZna3NBUN0J3nGFNTPQcZkREJ7LS/eQEXLjenY3 yus17jRIk2sTBF/IR/G1fGaMPjSt04yOgJx6ErrRWuqwoDmajPsJ96V8ysRNHPOwNeGb sXsACduGgyrH1ynpLSBrmszNxkBh0dZQemL/2nfq3j63X7gfhu/wqSX7d8OG4UnrUqe6 1pfvTyh8AfH+xx5aUqTCdtadC6JSYSlpVL15dHcMI8PLCoEiQpZma1yDhUEE5EjwICF5 pwmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=nW/dzkmMmLTXGV0fNSXS4PYkmlPbfNrTAfGYZoWhCjk=; b=SByxF8r2VIZ7bQmf4LB6kVSzkQNh2W+1ZWnB3O8fABuKDXqmjUJWopWWpfUPP2PbP3 TRqzvKkqCmrEXkKNOL8ystiQD22enGHnhjC4RtlUm8SOfRIZvUE68O+UWbaWne4h2NvO iMxCaJkUdc/tRkePJFTQ98IHhKg+eQOOBICDcOxRX12vQH+zN3byU94EOK8Ac/oCZ/nF CJmCLozMBXBbx5OazMFYLCrhxGpTnCYDXs407QZnYdZe5wMzEVHLC3fyl3fiXhUoolrD PhZHC0VZ1D+pxJcTB4QUM4WUrnVsTzdkQsTN5AGjNnxcsBrvrJmytsH9YdHn58kac7Mv Jn2A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of netdev-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id x18si3484640pff.280.2019.04.26.12.59.26; Fri, 26 Apr 2019 12:59:27 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of netdev-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of netdev-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726571AbfDZT7Z (ORCPT + 9 others); Fri, 26 Apr 2019 15:59:25 -0400 Received: from mout.kundenserver.de ([217.72.192.75]:59893 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726400AbfDZT7Z (ORCPT ); Fri, 26 Apr 2019 15:59:25 -0400 Received: from threadripper.lan ([149.172.19.189]) by mrelayeu.kundenserver.de (mreue108 [212.227.15.145]) with ESMTPA (Nemesis) id 1M3UdI-1hJYlX05rO-000g0Y; Fri, 26 Apr 2019 21:58:57 +0200 From: Arnd Bergmann To: netdev@vger.kernel.org Cc: isdn4linux@listserv.isdn4linux.de, Karsten Keil , Paul Bolle , Holger Schurig , Tilman Schmidt , Al Viro , gigaset307x-common@lists.sourceforge.net, arnd@arndb.de, Thomas Jarosch , Birger Harzenetter Subject: [PATCH v2 3/5] isdn: remove isdn4linux Date: Fri, 26 Apr 2019 21:58:47 +0200 Message-Id: <20190426195849.4111040-4-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 In-Reply-To: <20190426195849.4111040-1-arnd@arndb.de> References: <20190426195849.4111040-1-arnd@arndb.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:hgoFvmfI7N1gZXbzueDD+pjxCD2g+n9WD+aAb7AvXFNKc45reqZ n7KgZUR/4kecFbiF53y2/RhuJapBA/hMTyT/HqMSK5wK0jLJE8AXo6/tP/PatOQs8a5dsW/ 8ED0RccqRt0AhxtuQE7G7WRVH6wwYzc751hwQz/mh7pODszWLlWDe/96u9sZ6KVzlur4OK2 Z/EGFCDfFwekZMjVCxzTg== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:Ym5OhvzNRi4=:fwoH6Z2CQkatS7itVD26Zu qjZtYuBZToHZuEwR0Oug1hsGqnIh9pQP0TC0uRpoS2t4Iu9zn6D+XgUcIvwP/z6k9ODxsRBzj bzLWZ+e4NH/sGELaTZwfC6IkyALluIzzhGP4lskTn0PXOJle80QHut7oM1qLOqCc1Xe/ByHHx wrekZF30ivGwWiYSd7lYmsaSh/NDBfIRW7OKDUurrodqqq3a/v4RFPv5DaJ3aAZoicykEOsPL 4B4LMqVywyuBumjcbLdtHfwPO/DFM4Kpbla8K6XpN7TuodCgSuE5MTJsGkD4BceGcBBqoyBU+ NRkolQE4Cc8jH2MyokvK9kHH4i+WsE3XwNnk9HZyRX31kAnpwkL5lBdfXOVksuxz7dwCuGps0 hM4gz5SqN7vpo3BFua7PkcEjM0Z7sHw7WmJ/wqU6VFW6ivan9HeGfADls+F9nusVRN8FjjpBY ULSZxQi3TH0ZAfiA7oytjaVvtVUvradjK7XW6Jk18SIjDetFRwHV8fsVcL1tiM1Q3L6MX8ypZ L5UjgzgtGgj90r3zQvI0SNz4teR+9RWpek0xYqOLpANdbgvxEafRrxgftI2zNKtmz5De/saT/ pH/xN5Yc+yQMtbfu7k7bCcGK/zMAyqSwzmKyS5U6/9cPZd54qUbIl6P42N7K38S6omykx5VTV gG+lDra3dqXr21wrUtzuHbDuyUVNgsH99bgRU1A8k28sQFZsTeNpdSFy5m7PPCl9XTuK9pi9u 88inc0J6FFTy+xMNbeq5mNgBgbfOYOo8fi2HOw== Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 --- 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/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 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 - -Isdn4k-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 - 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 - From patchwork Fri Apr 26 19:58:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 162970 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp1145404jan; Fri, 26 Apr 2019 12:59:50 -0700 (PDT) X-Google-Smtp-Source: APXvYqy176FczEzpkymugV5HUCVGBVzmdD2ec2hVvCZmNkJM/WHpT7qRMBnKPtFIsRAWNsXVL49a X-Received: by 2002:a63:cc48:: with SMTP id q8mr16415046pgi.202.1556308790278; Fri, 26 Apr 2019 12:59:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556308790; cv=none; d=google.com; s=arc-20160816; b=OJKjdB4MUyNVi/05alZWXfVgnAbIytcQ+mzFzyJcpEwfdy4vgayQLCsoq9HusMzbVO FwsSPzKyY+tpysczrZ01hymdKJCykb/879VYycqnha5XMSyQP7yZZTkVYHWjYN0AWPrH 5qWGqgH+ATwggGaBmBv8POiPcyF+P3XKKW/RUjVYM2d9CO/sxUdE8SAIur6TYkdb+lM9 kzn3DaVrLMU+TbzFU4FsIpR40+eWk9vtlt2/fGQ7+eZ/8mXG928OtFxjPY7cUlu28PG0 AAvwpDAdoeczpN+1NP/6ehReXtEUPsXDJXrG3W+CgB327G3GhAQ9NlOI3J5uKp/6sfis Mcog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=dmdQ9we9NmnQe2tciFbm4WjFsLNarw2C+FlRghNI1MU=; b=m3gDunKezIT/XAxe9cMtQUvciYWJojxoclV1u5/gFUp2d4L9ehhJI3f8Uq48FpYQk3 7cYO+lb29xUYMexUsdD64wSjLN2udP5jMOmwfRDVXHI5Z1wtM6ED2gjA+VRiu7911aA0 CseFmv7e4dr785wcgAUjIVyBPr5SqkQ5Af8hCnBOdtQeuW1AVqZYbSCnSESWg7a4sXw6 lCuIJ+xFI0BMdi6aZTMpvNxjUSL7OaToGWwq6EF6D+xqlOS81Vr5qaPFzyqmMZ8U5re2 6XUlj2gZNCw8DiH5SeB/MnPCT479y8CSsUaJHWuhKk9l9XznrbGUt3SrZzU1IJ9U6moF /vDA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of netdev-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id x18si3484640pff.280.2019.04.26.12.59.50; Fri, 26 Apr 2019 12:59:50 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of netdev-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of netdev-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726696AbfDZT7t (ORCPT + 9 others); Fri, 26 Apr 2019 15:59:49 -0400 Received: from mout.kundenserver.de ([212.227.17.24]:41549 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726400AbfDZT7s (ORCPT ); Fri, 26 Apr 2019 15:59:48 -0400 Received: from threadripper.lan ([149.172.19.189]) by mrelayeu.kundenserver.de (mreue108 [212.227.15.145]) with ESMTPA (Nemesis) id 1Mate1-1gmQsE1kWR-00cUnT; Fri, 26 Apr 2019 21:58:57 +0200 From: Arnd Bergmann To: netdev@vger.kernel.org Cc: isdn4linux@listserv.isdn4linux.de, Karsten Keil , Paul Bolle , Holger Schurig , Tilman Schmidt , Al Viro , gigaset307x-common@lists.sourceforge.net, arnd@arndb.de, Thomas Jarosch , Birger Harzenetter Subject: [PATCH v2 4/5] isdn: hdlc: move into mISDN Date: Fri, 26 Apr 2019 21:58:48 +0200 Message-Id: <20190426195849.4111040-5-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 In-Reply-To: <20190426195849.4111040-1-arnd@arndb.de> References: <20190426195849.4111040-1-arnd@arndb.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:9bb30L3O4c5RkdBhDQfpSd6FaKZ146N26N4nMfFsAPoxAOJjMkJ QTlYwIBNj+jnsOlPZN59CdkwWJiQWrrcG1UWzN4UN9pv1sCA/HjMFBrHTmi5j6TTHFrAsaR G778mp+CIYePJCMScEvg+74IpF/Kwlxqn8oYU858FMkvONWEyFwdYsXXgkZuikuHgUGUOsY hOipzi70eBlzWJEQS6GIw== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:dvIUgAv4MeY=:JIBCGTnnWaQgEfUMQY9izX kp8DDvsCj/KKeWi4jLbn0Uewboz9vkGq/Po/ylKohsLKRvwpdeuaD5gMtVsOuvObDPjxG+lIh pC6IMgCJlI5pqARJEV7R77QEmhw1/pkw0A/5BazuOKbJZ6iqMGAQv6XX2R4clPKgO72O/nHB5 a8mGied7aWts8zWkcT7GxGhwWE8liIN2YJn8NbkTvsagHi4Re3co5/c+JbVGYMaGUdz7pK3BK hM9OOKSWzr0jv8pfvPzqiNGb2CMelmECEJ7lF4fbwD6QA1bie+G0YR8+13CP0tHDk0u05w+CG ddCxganlM0fp//rMzZiQfkmj7gOmrbcRdGL8/M2f1g/kWVNe8ZW4sIXJ3AkyGp4ovLldLEMtF BLHf0ORSIkEaAkhKXv8hMOUpdGh0jqBGFmf4EYKZZ/+Wgi5LKLM+L+kn6q91OOkTB+ssahT9T YqSUbJ2XXTpIqPGBrwIhksWe6r35f4Z2fUszNjIlWG79rNPKD+K1+0et4tu/uDlFXI9/tGXfd Zsagt8UiFbd6GH8xkx1ezQ8t5ibQfONSI8NRvJdI1OOojYAAZNk2ppOvBzExC4s9qCYzM3Mx7 gRi0QHLDZnKzXkZyDQGD2c16wz/BIy3L453oxjiDuliJleypGm4pOePjbl64R8kxlL4AwZG6T kqqLJiLpSnJTybLLHU2CmaNNJbHaXHACS5vyINBt0394Rc3qmuiqjnTa4HeD5sww9bRog0bfO Ty7LX1Rx3SuNQB8GDbUiQuZIWEvwtpxfWB6O5Q== Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 --- 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/i4l/Makefile b/drivers/isdn/i4l/Makefile deleted file mode 100644 index 11fe697739d5..000000000000 -- 2.20.0 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 #include #include -#include #include +#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 +#include "isdnhdlc.h" #define NETJET_REV "2.0" From patchwork Fri Apr 26 19:58:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 162968 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp1145094jan; Fri, 26 Apr 2019 12:59:26 -0700 (PDT) X-Google-Smtp-Source: APXvYqwlJT8TrNdcs1WXwDXRkwITKmMaNmKSUpiGiLg58t7bMCLICJpc4Vyxe9+/oQLVbeOwQhoB X-Received: by 2002:aa7:91d5:: with SMTP id z21mr48797279pfa.222.1556308766290; Fri, 26 Apr 2019 12:59:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556308766; cv=none; d=google.com; s=arc-20160816; b=VNu7WklnwkSlYBl6TkZB+CoKxD3el3NRAJorA13PBNv9jsYpzCImPN+dJTKmElTFxx z2x3GedyCLBfz+OENmbFxLHqcZhKg4ySh2AMlLGH0RV1652/1QL+oHXr3hwJMgoPJTnl 92KbIcUeGhR3zgcdx2Xer79htdPzjPSUgMx+Mgvwbd97ZT/OFxGSwLlDLIog5CnzxBmd ji91dJUPSYyWiCBGCXfqN54OnuqkQfIY6gizcSZ734QtHmkCIP758m061laXldWhthWE 0rZOCR9cMuQ9WYqS4g19W+7QHIYnOhOybTG5G4OknbNH+u/2OOcmvWJEJFonsgqu1DSa nL3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=xNQ10kkgURcf7wkiX2S2karcrT7NeKxrTDjR4PR0gYU=; b=LI0G0ApKskXHfzgEeL8sHM82ch9k384Pd7NKcxdYMAGIn7VRl/WYdUUnbSZ2O82VvG h8H89kh8PLguvd8NwTri5JvrMNTQ850+fw9qO4mXw4Y5FFxYUYYh2QOBWKlDKYxxYlAe Y6r8CXP77Mu36mc6N58e5y2Ces7jHNVhJ6kWLVkdDKSvdnauOFIQ2xJkZtfS5mVp5G8O OwXYDnTl7GR1EMR1/rNl/hSqjFxxIv07Yb3YgJZm3Ol33B3cnqrshnug9pcGeRnXNfkY ImDibB7p4saLInw+V7WX2LqOjF7psKhE6ZfKh05hRrU05tvEDPlweWOkrR5aX4aEAJoL XTJQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of netdev-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id x18si3484640pff.280.2019.04.26.12.59.25; Fri, 26 Apr 2019 12:59:26 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of netdev-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of netdev-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726480AbfDZT7Y (ORCPT + 9 others); Fri, 26 Apr 2019 15:59:24 -0400 Received: from mout.kundenserver.de ([217.72.192.74]:59373 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726310AbfDZT7Y (ORCPT ); Fri, 26 Apr 2019 15:59:24 -0400 Received: from threadripper.lan ([149.172.19.189]) by mrelayeu.kundenserver.de (mreue108 [212.227.15.145]) with ESMTPA (Nemesis) id 1N17cq-1gdo3X448A-012VyU; Fri, 26 Apr 2019 21:58:58 +0200 From: Arnd Bergmann To: netdev@vger.kernel.org Cc: isdn4linux@listserv.isdn4linux.de, Karsten Keil , Paul Bolle , Holger Schurig , Tilman Schmidt , Al Viro , gigaset307x-common@lists.sourceforge.net, arnd@arndb.de, Thomas Jarosch , Birger Harzenetter , Marcel Holtmann Subject: [PATCH v2 5/5] isdn: move capi drivers to staging Date: Fri, 26 Apr 2019 21:58:49 +0200 Message-Id: <20190426195849.4111040-6-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 In-Reply-To: <20190426195849.4111040-1-arnd@arndb.de> References: <20190426195849.4111040-1-arnd@arndb.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:90zBS+zoHMCowKKW8taH9a4tyFUwK9xWSOCevkzzZO4hZoDh3bk 1cmLncr/gNYJIPkrxMlaH84joppugHX3jbiVsvpGcbt/Qf6Ceb7fo9yogq81x4Bcprbra9o lGlQxxzzTz6ispbqDfC//fF0MCiwdKotaHOLGVwkRC2shIPzHr+3MngsDo5+qa9fQ2wtvqm /Pe1fUEpNtwEvZZ9Hq3zg== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:NeZz4BkEth0=:c4Vn4kss4+zzUG/9pmgCJV zHQ9M2GdaHuh6rx/GeIuBm7vust2eoVDUOPy84S42bTOgx2btqHnLsRHuptegBJqUACm0iih5 2Z859Lkaflo7tCwPsoZnlo8h5Ujk6A44klZoGF8wg9oRkdFRnjIS+9ZRMGsfWQ1DRkYTm99w+ vq+yGbvq6Al5xSV1EMLGjjfwanvqufG+R+mkLF3Dw6Mz+GZHcD11331NyAAA/YlhJGsLBYdzW Rx6+7qcYZ5vcA6JKoE918fOG3vmriyyqnrOKNVrEFZtLmN7VeY+Aw+RgLhnNwMXf8tBvd1jtE SWWMT94RGjxSE+jVguPrOyVFOm3hm2nk7Yq9ZIgkgaEhCHod6mJ495gh9Rs3cjZbU2yk5WtLm Pgh/JZGxrBOh3COMQqdo14K8eOiKIgB5W8cRf94Lxki1APkRJs7hPI5xhStuVW9OsPXMiya8x FO0PAwTPVw9UjCYNW8Ll3GoUtyon/RVe5FnXXy3ea7lUGKxpAOJgkHecDAl8KK5DEYH+8XEOJ XFP/txtKDVr3uMmmA1FhqTvbulZRoOVRPxDqg4JUZ8MZzcH7vVpzrs3lLK44wMWEgV0JeIgDC qUdSMM9NF5mj7fi1+0sL5AsnsYFflrl23C752noC0nzwxRwlu8YztGd/0PPY8wcDDlcaMhaEu KvNe//BJNs+G143lQ1FLMCp/xM2NvM75fNkyzZbWGE0jnY1Tr1Dq/Swb4E0vXoMNO9I/vDFfC zt22HjdhBT2FN0CS+OgHLXvDqnnC4CgO/uhnlQ== Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 Cc: Paul Bolle Signed-off-by: Arnd Bergmann --- 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%) -- 2.20.0 diff --git a/MAINTAINERS b/MAINTAINERS index f6adf0484dc0..05ab6963cf75 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -6560,9 +6560,7 @@ M: Paul Bolle 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 @@ -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 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 +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 - .) 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 + .) 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 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