From patchwork Tue Apr 23 15:11:39 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 162712 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp3900773jan; Tue, 23 Apr 2019 08:12:35 -0700 (PDT) X-Google-Smtp-Source: APXvYqykgnCdhsEfUCJZl9sx9uOzRYzN2WjW+HW6hu8DmgZ6/ntOpFh6YD+Ojmf2YQer5VK8A+cN X-Received: by 2002:a63:c302:: with SMTP id c2mr25418475pgd.235.1556032355070; Tue, 23 Apr 2019 08:12:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556032355; cv=none; d=google.com; s=arc-20160816; b=ezRUA48VZCn5R5aH1BfS5pGceUdJacr8LtJgT5zmHsuhfPcc5sCKbl+XuyCRVLlW1e Q7sHCvx8Con4R/e5hHhbotLTYs+H2rDN7DAoHjNRjwBlxXy9+dP0iTJzG5C/I6w5jaey NZ2ncl1CUFaqLa96K/He86ymc/hz0Tjr6002QYqexJA+osLBsIsHGpUqc5Syyya36bOB JZnixDwR0jv0s14skrNxke/BQQl8WnVDMjMgT/Btw+zqQCvHHyGO20OIWJGfw/N2jv6R BYtXPQ6pu7jHFN8uOk7HeAV4d1GKj4vfbZ7I5mDIwNx6ltGi24FgjdBQxyyo2koDkD1K lPUQ== 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=CDGTPQSmzrhuGJJpdCQ2VtgdBXr5QAACjIVJo28WDW4=; b=nEqe/9Dxxu2clfUYdItIyz/cPDfGxaLSBQ/9w9SS3BRnoUDdlf6B1Ig2hYkOcLIPdr W4AzYNcpCZLduXEHgH5wg+FMbZDLRmMz9Bll2y2B37ZA10SXuymeBeqnEu7I0nhwujAj LBeBTQRLcEfH/8X0MH4k0DfubjY9UI/sJ4vZ7s02lkWGhjo4JvaZdlslOCb2htyf221T CqS+xqmqaSYcLb0EAECgXJIxJmf93QaUX0tG8ZfG+aJLMTzGHYBjO7fs1flqXU8V7DqC iIAr5GTlqFIJo9rgtM8i2Bi9fgHr9FPISRrmq/nT6T3W4Ju3oo9ZUeUv2aQ4OUDRB2GL rRlA== 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 t20si3279580pgm.457.2019.04.23.08.12.34; Tue, 23 Apr 2019 08:12:35 -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 S1728313AbfDWPMQ (ORCPT + 9 others); Tue, 23 Apr 2019 11:12:16 -0400 Received: from mout.kundenserver.de ([212.227.17.13]:57943 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727754AbfDWPMO (ORCPT ); Tue, 23 Apr 2019 11:12:14 -0400 Received: from threadripper.lan ([149.172.19.189]) by mrelayeu.kundenserver.de (mreue109 [212.227.15.145]) with ESMTPA (Nemesis) id 1MPooP-1hVPP92LKt-00MtcO; Tue, 23 Apr 2019 17:12:00 +0200 From: Arnd Bergmann To: Karsten Keil , netdev@vger.kernel.org Cc: isdn4linux@listserv.isdn4linux.de, Paul Bolle , Holger Schurig , Tilman Schmidt , Al Viro , gigaset307x-common@lists.sourceforge.net, Arnd Bergmann Subject: [PATCH 1/5] isdn: gigaset: remove i4l support Date: Tue, 23 Apr 2019 17:11:39 +0200 Message-Id: <20190423151143.464992-8-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 In-Reply-To: <20190423151143.464992-1-arnd@arndb.de> References: <20190423151143.464992-1-arnd@arndb.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:dJ9kwmOewfhfPWwjWIvWygridZIfq9TO6M4FmFBMmSfOALgBC1M MJ5cJvBbqqjSeMYzLZ/VYIPR5ULYCl4tWAYIneiQn9Vus/+YXDILGTVvTb1f9OGVLhgv5Zy hkvy5j6drkarveLCWNRgmlK04e7JyOnRSf89xM2cRIoB3nC5r+afERkAa8MPHjcHghHCYEF NSJFsOqBzPaeHsw8mTg2g== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:RhASnf58B7s=:FyMrs+7N3L1brxj1J3NKj6 QDP0Dda4wv1fwCAZ0cyddECtDBLCoSAf4X0K92sVjZF0FVeUujwyggoroQc5toCuuEyDuknJ+ KVxyN0GxjeUI67EkSDGJ9pIbCEskEFsI8pR/4Bj5+yOV2eOzhFhBX1/u1g1ywZNJRmuYMlvys daPpL2p+6jQxQGWVS+ezVsD7B3gNWFiJW5Phg3ATGg2O45ul2aTXKb9JB3MEG2Zhshb9TAlUN TUG6TN1dbbtDXX2xJ8i0ouXd+Y9B6MWjORIwYpQcEZRfAhxfOy+3zvHDlMnPOnRrqSmQ47wp4 bsFwmVgBH4eDU2c/r84YHTBaDQUOt5tcV8iDQzrM+UMFV4zKFVzNEV5PKE7mXyRB3OhLjH0WU QUG26R6WdmUI1AEVSaZQtyV9zW+db8IZTfbCqnsOXgB5k/KxF2X3o90gE9JD8hNZnoe7nUXsn gLZofYubfVhaTuB8n9fXVNWzwTit27eQek9J3KYzJgyuju7vAPsh7n7VUStKyGLV2+26pJXEW exnyU2lgbKPnmMy6rr99YEDmsj1Fr+YyziXRK7o0sLgx1FB/vWi/zSyo3Ks0CoqAotR6fnZaM J1yVPVSKi5HGuBoZUpW4GaFMeW2yoK3KU0lqzyjAzmZ2VXS4yUnN9BWfBZlgxcYcylutt8eSl mbEeugGqNfW0JaIgSHA/x1GgTswLvKjoKo1Sm1K0EtV7ASfoGWFcO8InVDpce/dp0MYUCzk7j wf4ZIINwJYGzMV96Y/4KkXO7Gq7setYnC9JOcA== 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 | 22 +- drivers/isdn/gigaset/Makefile | 5 +- drivers/isdn/gigaset/dummyll.c | 77 ---- drivers/isdn/gigaset/i4l.c | 695 ------------------------------ 5 files changed, 10 insertions(+), 825 deletions(-) delete mode 100644 drivers/isdn/gigaset/dummyll.c delete mode 100644 drivers/isdn/gigaset/i4l.c diff --git a/drivers/isdn/gigaset/dummyll.c b/drivers/isdn/gigaset/dummyll.c deleted file mode 100644 index 570c2d53b84e..000000000000 diff --git a/drivers/isdn/gigaset/i4l.c b/drivers/isdn/gigaset/i4l.c deleted file mode 100644 index b5b389e95edd..000000000000 -- 2.20.0 diff --git a/Documentation/isdn/README.gigaset b/Documentation/isdn/README.gigaset index 9b1ce277ca3d..f6184b637182 100644 --- a/Documentation/isdn/README.gigaset +++ b/Documentation/isdn/README.gigaset @@ -48,9 +48,8 @@ GigaSet 307x Device Driver 1.2. Software -------- - The driver works with the Kernel CAPI subsystem as well as the old - ISDN4Linux subsystem, so it can be used with any software which is able - to use CAPI 2.0 or ISDN4Linux for ISDN connections (voice or data). + The driver works with the Kernel CAPI subsystem and can be used with any + software which is able to use CAPI 2.0 for ISDN connections (voice or data). There are some user space tools available at https://sourceforge.net/projects/gigaset307x/ @@ -92,7 +91,7 @@ GigaSet 307x Device Driver gigaset debug debug level (see section 3.2.) startmode initial operation mode (see section 2.5.): - bas_gigaset ) 1=ISDN4linux/CAPI (default), 0=Unimodem + bas_gigaset ) 1=CAPI (default), 0=Unimodem ser_gigaset ) usb_gigaset ) cidmode initial Call-ID mode setting (see section 2.5.): 1=on (default), 0=off @@ -154,18 +153,10 @@ GigaSet 307x Device Driver 2.3. CAPI ---- - If the driver is compiled with CAPI support (kernel configuration option - GIGASET_CAPI) the devices will show up as CAPI controllers as soon as the - corresponding driver module is loaded, and can then be used with CAPI 2.0 - kernel and user space applications. For user space access, the module - capi.ko must be loaded. - - Legacy ISDN4Linux applications are supported via the capidrv - compatibility driver. The kernel module capidrv.ko must be loaded - explicitly with the command - modprobe capidrv - if needed, and cannot be unloaded again without unloading the driver - first. (These are limitations of capidrv.) + The devices will show up as CAPI controllers as soon as the + corresponding driver module is loaded, and can then be used with + CAPI 2.0 kernel and user space applications. For user space access, + the module capi.ko must be loaded. Most distributions handle loading and unloading of the various CAPI modules automatically via the command capiinit(1) from the capi4k-utils @@ -173,16 +164,6 @@ GigaSet 307x Device Driver Gigaset drivers because it doesn't support more than one module per driver. -2.4. ISDN4Linux - ---------- - If the driver is compiled without CAPI support (native ISDN4Linux - variant), it registers the device with the legacy ISDN4Linux subsystem - after loading the module. It can then be used with ISDN4Linux - applications only. Most distributions provide some configuration utility - for setting up that subsystem. Otherwise you can use some HOWTOs like - http://www.linuxhaven.de/dlhp/HOWTO/DE-ISDN-HOWTO-5.html - - 2.5. Unimodem mode ------------- In this mode the device works like a modem connected to a serial port @@ -281,8 +262,7 @@ GigaSet 307x Device Driver number. Dialing "***" (three asterisks) calls all extensions simultaneously (global call). - This holds for both CAPI 2.0 and ISDN4Linux applications. Unimodem mode - does not support internal calls. + Unimodem mode does not support internal calls. 2.8. Unregistered Wireless Devices (M101/M105) ----------------------------------------- diff --git a/drivers/isdn/gigaset/Kconfig b/drivers/isdn/gigaset/Kconfig index 83f62b8d82b5..805b5d034feb 100644 --- a/drivers/isdn/gigaset/Kconfig +++ b/drivers/isdn/gigaset/Kconfig @@ -1,6 +1,7 @@ menuconfig ISDN_DRV_GIGASET tristate "Siemens Gigaset support" depends on TTY + depends on ISDN_CAPI select CRC_CCITT select BITREVERSE help @@ -17,27 +18,6 @@ menuconfig ISDN_DRV_GIGASET if ISDN_DRV_GIGASET -config GIGASET_CAPI - bool "Gigaset CAPI support" - depends on ISDN_CAPI='y'||(ISDN_CAPI='m'&&ISDN_DRV_GIGASET='m') - default 'y' - help - Build the Gigaset driver as a CAPI 2.0 driver interfacing with - the Kernel CAPI subsystem. To use it with the old ISDN4Linux - subsystem you'll have to enable the capidrv glue driver. - (select ISDN_CAPI_CAPIDRV.) - Say N to build the old native ISDN4Linux variant. - If unsure, say Y. - -config GIGASET_I4L - bool - depends on ISDN_I4L='y'||(ISDN_I4L='m'&&ISDN_DRV_GIGASET='m') - default !GIGASET_CAPI - -config GIGASET_DUMMYLL - bool - default !GIGASET_CAPI&&!GIGASET_I4L - config GIGASET_BASE tristate "Gigaset base station support" depends on USB diff --git a/drivers/isdn/gigaset/Makefile b/drivers/isdn/gigaset/Makefile index ac45a2739f56..f8ba14735bf1 100644 --- a/drivers/isdn/gigaset/Makefile +++ b/drivers/isdn/gigaset/Makefile @@ -1,8 +1,5 @@ # SPDX-License-Identifier: GPL-2.0 -gigaset-y := common.o interface.o proc.o ev-layer.o asyncdata.o -gigaset-$(CONFIG_GIGASET_CAPI) += capi.o -gigaset-$(CONFIG_GIGASET_I4L) += i4l.o -gigaset-$(CONFIG_GIGASET_DUMMYLL) += dummyll.o +gigaset-y := common.o interface.o proc.o ev-layer.o asyncdata.o capi.o usb_gigaset-y := usb-gigaset.o ser_gigaset-y := ser-gigaset.o bas_gigaset-y := bas-gigaset.o isocdata.o From patchwork Tue Apr 23 15:11:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 162707 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp3900556jan; Tue, 23 Apr 2019 08:12:25 -0700 (PDT) X-Google-Smtp-Source: APXvYqxbvD5r34JWgZQejexNye5eFy2K54hS3Wd4T1mq/fHAW7Ibt+jVoA27fnZBkiH/WMWivmKR X-Received: by 2002:a62:5797:: with SMTP id i23mr27407472pfj.12.1556032344910; Tue, 23 Apr 2019 08:12:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556032344; cv=none; d=google.com; s=arc-20160816; b=Pw5ax1wii/aLPIHI7+CHNGo+iRjGesAvf5sLM9Ad/EEh6zl3qhvs9dOZB7Q4gm7718 1YZatcYwQgBJi5DhQb3JYR2FR193G9zM4jCvKvDfvwglOE64/CLdXDwGquVddtLTHdqd OZnDD7w5R3kXWIqjriOXi4qDccxiT/vj+oOpLylGFYoYD0dVO4/4jZTYqTrttRtfwLqH mKNrKN4yPsZXlD4DR6qcxS+kH4yXmrIIQnDXmTO1K+4uWbLfomZdy/dOe7JiZ3/6nzL+ MXRtd4ONhHtv1YB4Lq18NlEyB6JPdSKvucA6g0Ta/NrQg8WezP1bRfm72aSmlnVSTHyA pTVQ== 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=7o542Ue2RmU+ICwIhWI5y3eD6xZsiX7Eu2nxktKWN2k=; b=I226L77sbF46QBJ4hG8l09xBFhYx2L0W2dq7xf9e+adJkIPbBvt7UcL6sQ/NZ8sWDU KbJYAKcMlAwe3Osfg97qW3fXFm92EUxHwMGPay7x8EM2AbcyJyat4g3cFU2bD5IgRux7 gmGJbzYoG03FoExIuC4GZSW601kAwfiOYKKB3OACD0dl9m7b2htgBNu4/6MOdegqnU7d ezqGZ6i7oTBq7BYv2HoTXfAU9i24/E+sIljn05CoZcYBd9MumDsjiy021agacAbtQeBw YkjEqgzihYFkJEJ+tqXoyot0trvFR1Hg8wLXfyeYpTRRCo770FyBY3grpWQ8UGFp7pU0 V7LQ== 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 t20si3279580pgm.457.2019.04.23.08.12.24; Tue, 23 Apr 2019 08:12:24 -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 S1728389AbfDWPMS (ORCPT + 9 others); Tue, 23 Apr 2019 11:12:18 -0400 Received: from mout.kundenserver.de ([212.227.17.10]:53997 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726655AbfDWPMP (ORCPT ); Tue, 23 Apr 2019 11:12:15 -0400 Received: from threadripper.lan ([149.172.19.189]) by mrelayeu.kundenserver.de (mreue109 [212.227.15.145]) with ESMTPA (Nemesis) id 1M5Q6l-1hHa2d3FOH-001OSE; Tue, 23 Apr 2019 17:11:58 +0200 From: Arnd Bergmann To: Karsten Keil , netdev@vger.kernel.org Cc: isdn4linux@listserv.isdn4linux.de, Paul Bolle , Holger Schurig , Tilman Schmidt , Al Viro , gigaset307x-common@lists.sourceforge.net, Arnd Bergmann Subject: [PATCH 2/5] isdn: remove hisax driver Date: Tue, 23 Apr 2019 17:11:34 +0200 Message-Id: <20190423151143.464992-3-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 In-Reply-To: <20190423151143.464992-1-arnd@arndb.de> References: <20190423151143.464992-1-arnd@arndb.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:pjz4RcsvA5bGj8jjTbCfFbOblJWIQUup31EbM11iQ19AC61IXZj A5Zm2HbrW2rSImiUotgiYCM/JSWj17iU3swwgAweAIKQYpbRS1BuK260WNskhFO08xdeNKN HY5AYIrrN3FT9g80TpBkHG2VKT7e+cX9BtB2LmvU1FiKQcitNRx9qVf29c77j8sm9+mGRVk 9fQq1pIdFm4JBI/wB/ijg== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:CnzNGGRuGC8=:M+W5MPykgclLbFtP2EAcIg BfaEWGlHhN30/QZrp+6ytrEVPuu2PcSd6b1jbsbPY6d6xs1sSHWOh/QcDmMSNMYgwBHhYnd0h 9ytwF3eIaqyte+emeKOCUNUUtvRovO3CYZyZNRmmGOC1FYpnuk9Zekheirqcf0LWZwvEOsT1T HaoGk6SyasSAQTJPvfc59iOaDexua8MvXsYSk36c2suF7qY9uNBbUNbHHdWW4PnaNKmE7VkMn m16KJqeJCWCPp2dcKiDy/hYuxUXdCKEBIGVo+272pkWBe1shlIuIKtsrM5UTZhgDked42XOsi ImxKH1iq/2LxDdSW9GEc+mxkblX+xstFvrzS9CZg4KE7WvRhmXwuYls4gZQaVg8G1GFPFtKIb ZUbhhIkh1/Ss0QxcfdJC4T7SunNxR0jMMGb2VkVWB0/gR8Bm0US2FDHGecy0+yQrFT0NNClQS 2XheEY6MQ9vEQGXp+rYoBVikKJG3WzOvzZ/IRV1/yzFedAupFDLrq9v2uZlZTr7Cw11xzF68Y nNHSwEEgglZmwOnsIyLAYYI7bVRj7W7pxWnzSoJwBl/wAoUF+BBFgWGgYWuQ/HPwSqaNWPEbI PVnud9KbDB6Fui/5HSs6S+CExyx/r5DYxqOGoePsz/kmX8qdzajK8MSALtrnAqwZc5dlt6UVa 7rosRzkv2Ea8eswxSPGrQIUF/pvzQnZAYt77f41F6jnQyb+RpGsP3wOpGVWwyAm30qjqF/FHe hwQsPttukI10HbVsyywR2ECEZI/9Eo+TEb3ksg== 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 completely obsolete, and even in the past years, all remaining users appear to have used mISDN instead. 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 b12e6cae26c2..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 Tue Apr 23 15:11:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 162710 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp3900698jan; Tue, 23 Apr 2019 08:12:31 -0700 (PDT) X-Google-Smtp-Source: APXvYqxWPlN73GXDiW/KfNElIL6diJoK8PyXR5pyQUNxKO5BWZqVz66LoaCsaw2HPMIJjirdV9HG X-Received: by 2002:a63:530d:: with SMTP id h13mr1101864pgb.77.1556032351142; Tue, 23 Apr 2019 08:12:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556032351; cv=none; d=google.com; s=arc-20160816; b=kKr0vKGJ8wGpKvH411HmNOU5KszKeEYSJqYGkghIfzVJVoKN1wQNm463QT11ktbRVc RxcXVjVvYsWpP7I5yXnL8uNMHKhphiSaqPRtUBsRwqMi8u/6CugGCFUxA5v6TnsazuBY K6EN2km03tM/On27gP5DOoGn9wJenp2Mrz3uq5np0osFMAEEXPD9lcWz20rr/AR44w3w QjS3/Zr+WM7e9ing4b/pKHa2DwxHiG9oCB118cJ/72nsr/02Bxz4sIgmhz/TkC3DBXSG ZpIC4YV9xWksgJxQKMLYq+hAvyEYvM7Xoy5AGwGbHI+V6HBiC/PdCVx60bXE9iwfBndS H9uw== 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=8E2vWc8QfIGK/Sn5wUuHSWuPfP3CrHonbBXGhbIkE7I=; b=R+wAiN1mUMvy/3u8736XKeHEziuwmWlq8SziMV1UCwUQaISMeDNRBh4T+zEl/YdTUt O8hGSoZOawSF8aKv7SnDw61CMZD1hwfMWJ4uOlq3+K3ZASzL6bgcEuaVhGk1ztrGzR+U wluYAtlxbVPWHuWBZsNh8kohKrNFKgmXGRK+Hs7IhbK5IJGcSAvqYSmJ881RG0YPMcaV EMVGh1qg8kF7UI/MfZnIPHUuybgxjK/kQBE0LO7wFyXGp42WO531Y2K5JBFXoNoiIrWk PmbzlZbC92PfNjY6uvbhs4+CqoGQiEC+Id1weZxjyHevUF+3cs+rUdexxd+HlVdgxPR+ gPsA== 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 t20si3279580pgm.457.2019.04.23.08.12.30; Tue, 23 Apr 2019 08:12:31 -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 S1728347AbfDWPMR (ORCPT + 9 others); Tue, 23 Apr 2019 11:12:17 -0400 Received: from mout.kundenserver.de ([212.227.17.24]:35381 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727740AbfDWPMO (ORCPT ); Tue, 23 Apr 2019 11:12:14 -0400 Received: from threadripper.lan ([149.172.19.189]) by mrelayeu.kundenserver.de (mreue109 [212.227.15.145]) with ESMTPA (Nemesis) id 1MBDvU-1h6GJr0y10-00Ci2v; Tue, 23 Apr 2019 17:12:01 +0200 From: Arnd Bergmann To: Karsten Keil , netdev@vger.kernel.org Cc: isdn4linux@listserv.isdn4linux.de, Paul Bolle , Holger Schurig , Tilman Schmidt , Al Viro , gigaset307x-common@lists.sourceforge.net, Arnd Bergmann Subject: [PATCH 3/5] isdn: remove isdn4linux Date: Tue, 23 Apr 2019 17:11:41 +0200 Message-Id: <20190423151143.464992-10-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 In-Reply-To: <20190423151143.464992-1-arnd@arndb.de> References: <20190423151143.464992-1-arnd@arndb.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:44lROSWY+a6fQkopCxQipUVTUWqwqDIj5tKzFtUZC/tvGkGMbqG YPXOu3MK7YQfGfLBaAzcYbCyc1wXR4u9Z6E+HQIYB4c3JHCvPcuefYciinmX713qfKQkupH uPrxd3XH22SyqJSeSqqT5m4XxhTUrLutjMQIbFIV0dmBPeVWcUulT2wsf2dJ9fOe6PcQ6Tb VvTZJhBjq4Uf7CzGlGMBA== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:i9JPfAeIJ5c=:luIFxKZ4GABjqRVTYv0DZ3 dI15vyw9OpYNfeBbELPqPph0fYfkg8VhowmFCpCwVwZ3r4KfzccsODay/9rYCGbZqxTqytUPx PydA2aTvJvAmT9sYFjsEQECGsrwOKRoJRzHTZTuOJ9+hUYP6UUbWe9abVNsHy3QQOy2/0ZVuh s5QujjrT4OR7MkV6UYgPFnhxe+9I1l1Net7vquHZtdaWrYSD9lxF7iQtEBxuoaQC5AzycTa8L EIWwsBAzpWLTzPTdGZjhYZ+vpKqZcLo3rgjb4XYGvb6IltITsGWo5obTrzUXLg37ohtFs/Xrd gBnA6Y6eRDpPRU+s4zyYFov7VcaFFH6BhCovQnaxHJ/4wfA1v/sPasJKKlyUuw3agIu9sYRlr 9ea4D/3NtIFomTweOMv9/axJg4RT7jxyKC6d30Vieub3iijI+b9sGmDivcnifcVX3iGJ0jsq5 6vqRhvvzNVZN+zC/LT4qPOOnjXRLKjPMOo4GZVRC1mZ7sDNye99ElpJ/1xfwJq1E7oWXkLdpe oklwtXgauj40RG13G/WoRieZCTBFJKlOBNeDw9p2Xnb41qWLLCwpxhihbSgyd8MKitFOvW6MD Lk/4Gl9SMqCdWQdhvEEfOn58r5eR8v7AFJaZx+WyVsrmvVtX4V4ICFoXbB8cZe3HAqJzMITnM DIVBgvdeDhad2LBJUHjCa3/xiIPWGtSURxtWxoEov1SOcp3FdZc2j/51gKiVWJrmJpKJQ1tWG hSbUDpL2BiDD+I3NrjcYrPcZmus5S61ReU2HyQ== 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 shut down 2018, which must have drastically reduced the number of legacy installations, if there were any that managed to get isdn4linux to work with a linux-4.x kernel at all. 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 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 | 3053 ---------------------- 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(+), 26864 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 1f17126c5fa4..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 3671fdea5010..1e3a739f0145 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -8245,9 +8245,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 Tue Apr 23 15:11:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 162705 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp3900359jan; Tue, 23 Apr 2019 08:12:15 -0700 (PDT) X-Google-Smtp-Source: APXvYqzoYMP+6tPs8pcq1x3qIwWHc2DDnpvUabyIVQBvr+Jd/UEJU61TMiTAy6M5H8IWpoV9/t4V X-Received: by 2002:a62:a513:: with SMTP id v19mr27050569pfm.212.1556032335670; Tue, 23 Apr 2019 08:12:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556032335; cv=none; d=google.com; s=arc-20160816; b=JFRT/goJYJ5nWLQ3n/DAyc1IctOooWtVFj1OoYqP9RVcDVbiL69/V3gEn6bm8yNrvD Xb/HU1xHgZhXdHx+B705K5cv+O16mW3HgQ2kD6D65R/Nh5OmDt7GAB23fggGIOhaR7QN S50BJnl7YBuwu63h72z0JSU2pJrhb86fGPqohFaRbKn+A1286ErrvmsNa01zpQfSYJac 4YUo+EUJFYQxQhw3NVXkeV3sX9L+2YrjOa5gCTekuwHG/H/QFlRnPWLcaEieS3/SUHqE 2IVnlSQDaNoVLlpd3ndWHqZom+MnFbmiFnU2ZMcvuU5HYpnZjdDvdCgSp002Ot1R5DOU HgtQ== 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=gv9m2Su1NlKFXiNqNLLXZO+evbdpMS+bDwb9oa7K/lw0O+bjWp1ghYyqlXMOCgmQZn papFUQEFL88nk/HlG81hDqKWmHC1leM47nE/AC3Mn0pedsueacJZSZWbHca9RYd+1+wv +5FbiFpPEr7+h+jPULPsC14xi1uC37IX95ShVo15iili/Ys1RwtcUt59MSXLATSeBHxF symxnrWiwUQ9V0f95Yh9kUE4BC9+gnxtffOl2n4fQ4PqFN1K7TzIHGtrs55nGjwqS57b Zgr19bADCGeRSFt84yahPBLV3H6DmxhEhg9T678G6H5PE2riohdFMQ44zBgoUZxSUtu7 EyOA== 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 t20si3279580pgm.457.2019.04.23.08.12.15; Tue, 23 Apr 2019 08:12:15 -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 S1728212AbfDWPMN (ORCPT + 9 others); Tue, 23 Apr 2019 11:12:13 -0400 Received: from mout.kundenserver.de ([212.227.17.10]:51481 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727656AbfDWPMN (ORCPT ); Tue, 23 Apr 2019 11:12:13 -0400 Received: from threadripper.lan ([149.172.19.189]) by mrelayeu.kundenserver.de (mreue109 [212.227.15.145]) with ESMTPA (Nemesis) id 1MqatK-1gWfxX2DMu-00mZlj; Tue, 23 Apr 2019 17:11:59 +0200 From: Arnd Bergmann To: Karsten Keil , netdev@vger.kernel.org Cc: isdn4linux@listserv.isdn4linux.de, Paul Bolle , Holger Schurig , Tilman Schmidt , Al Viro , gigaset307x-common@lists.sourceforge.net, Arnd Bergmann Subject: [PATCH 4/5] isdn: hdlc: move into mISDN Date: Tue, 23 Apr 2019 17:11:36 +0200 Message-Id: <20190423151143.464992-5-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 In-Reply-To: <20190423151143.464992-1-arnd@arndb.de> References: <20190423151143.464992-1-arnd@arndb.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:p83VG7RSop2E3Xfg8cj+qTAB3flKTSxE3LjvDIiJCaNlN33i4yv QvUnbXNkR0VXdayOf+ZVU8r7I0af31uH3kxc1KoyZnEKD4itzNx6JPxhZKbPTthBnmW/P5/ UrrEaxVianTawj8ehzz0RLBchRYj4LtWUcHfY8gB1T/OQVNJvQ5DaFCqrZ5Z0wdtcCQyxTl vqCEb95+zkZbK+eOp0WdQ== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:Uu+Engm8d+Y=:x8FD50UDdAhpMfzTzqzR4P HFOn3L4CgAlztAnyH3+OQk9ertXB6iv/19uG4KI4Yreq1dEeuASMmhyaJEUFEJS4RVzwZHWwI 6kLofOkyx4sy8oxzPcgPIuI28WpaDNraJMPfo0nc0z37CK7AdVfcknYZFsMf7UNpL6+ru0nw1 u0rnWgNW9En/VvZYHh4J2SL5SlXp5tDsg831uLcWaju0sH8z2yLJLLc+ioe08lZb7f2IyDCh2 LvjwafuGuDJISbUHbfWcj+q3m1ClIPAXX6HsMHNy8BHmxaShYqB//w1PyMHKtaKEct105F4zI ZNcls25HLuk+3H7lvVz2djA24ypH2+2ZY7DJC5C9lcfGIcZCVirMT53dQhbjbBgnWzGxw6laW nIX5NBiDiavb94zBUxh2KbiKaNRxD5YDB/Wungn4ObJFTxHiNXiMuqvrylHqr/NvFB9mExbd6 fs3/WG2vGmodNNwwy4JVbqUd//Y5YxpN704mHDgpu3tSxdUkCsUF9II4vMKNnFBMNohixQ3oj oX+IXIJjtLRJz20b8DYNDaA6lJW+8takgs3TLfjsjfIb1OMpJIyc3CK7xUm14CrDM5+MV5wxy ZjUb5n390he2p1BwxCPKQWJo1oqHsz3SheWGtciX1bCuBmyNWkNApNdfhEBfBqdhbE9vxec+W hWTqgoZOJVL3ARNBehCYkAupSoyfOITKaGF3pDTWT+h2lIU1/7qDZpR0GAZWfxmetekSJalIi ArCVat1UlUT4UmsRqu78PjwrakeEGeP600gxpw== 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 Tue Apr 23 15:11:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 162708 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp3900593jan; Tue, 23 Apr 2019 08:12:26 -0700 (PDT) X-Google-Smtp-Source: APXvYqxaPHu8V4RGy6Ld92Fm4L1z3mr1wdretU4fL3+BPLEXqah0FRvEkMMvVcLE+fTEOrX0ZqOc X-Received: by 2002:aa7:8289:: with SMTP id s9mr27281475pfm.208.1556032346920; Tue, 23 Apr 2019 08:12:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556032346; cv=none; d=google.com; s=arc-20160816; b=EbQz2yrhkuTgFe9C90fJi7hjhVLiRJpCRnWQVHvlFSOHQa39jtQCgmGkWfT/4k+0Fg 2raTQJPZEyh3/m8LzcshRyWgmhn+R+EVlo0t72SC2Vh0dnxMFcXaEbZm9QMrvf8+DSHK 83YuK/qvpVw0oSpvi2nF2/HR1CZuPRNp8TDGNYYAV6E+4T4i6bMxYk2aoCfnhIGlW96C Pn0LBq+qxwT+nFsFuYLczX348q9FlBGVd1/6a2+G+o81B3bSnYAVxAC7kmWC/BD57mbg r1hHgK/wMNF65F/piR9dWVlJB1G/pfZ7S7NI/IfeAgOhMtplIBxYFNHGEScAC2IvXzIk vrWg== 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=jh7lPkEgI91pdVj7fbEicjhdXDh2mpZXWr+3mm5sVNw=; b=e8Sh5W/FjHqeo7gakd8/e283HfZg74sWJIlVADpVGbFnfQx+ame/pfPHh68PLpTjx0 B1/ZrXhbjwh++rA8d0S8alr1LIhYRQHX95tv/rcHUdw1UiCTV4q+c4JsTTJlCtENNdEL TbZ5Rka+xIKEqA4Km5po0wALzH67KFjxj2TSrPHy6C70hSM8wNUL6yDg3fQAWq5oHifZ ZKGnNH73FKptbAakYQwnp+y8grJqsPDRatNkaYAFLeQTgiHpiTS/u/oKZnBNad0xlmou oTsw0ctL7/JIcSWwFNNme2AyRpBW5w3bQRQyBTHNUYgXjW5MUOHn0SWqaq0kIkyjWGBg cIJg== 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 t20si3279580pgm.457.2019.04.23.08.12.26; Tue, 23 Apr 2019 08:12: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 S1728368AbfDWPMZ (ORCPT + 9 others); Tue, 23 Apr 2019 11:12:25 -0400 Received: from mout.kundenserver.de ([217.72.192.73]:57293 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728329AbfDWPMU (ORCPT ); Tue, 23 Apr 2019 11:12:20 -0400 Received: from threadripper.lan ([149.172.19.189]) by mrelayeu.kundenserver.de (mreue109 [212.227.15.145]) with ESMTPA (Nemesis) id 1Mn2eH-1gZ8QI3fPD-00k6vM; Tue, 23 Apr 2019 17:12:01 +0200 From: Arnd Bergmann To: Karsten Keil , netdev@vger.kernel.org Cc: isdn4linux@listserv.isdn4linux.de, Paul Bolle , Holger Schurig , Tilman Schmidt , Al Viro , gigaset307x-common@lists.sourceforge.net, Arnd Bergmann Subject: [PATCH 5/5] isdn: move capi drivers to staging Date: Tue, 23 Apr 2019 17:11:43 +0200 Message-Id: <20190423151143.464992-12-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 In-Reply-To: <20190423151143.464992-1-arnd@arndb.de> References: <20190423151143.464992-1-arnd@arndb.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:jB4MoMg9GIHWZgtJkv6VRd1o02OCClHv/CJJv+JpUZCjub5DPGo /ppuZoO9Ix9WcU16dudRPcn1NSkSzp/f2OJVe5C7Jv/dYOVbfiy0kQBn92lyCWGlKmhqR6Z fhEKzhr95Y0JySOrFdyIPRlZ02AjxP74DbnTwexPPTZ9Olk2UHNQFzQMQNMIs4/6KurAVFJ okbjjr2yRuFd64GoQXtkQ== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:LP/SPf4mrVw=:6FyISYqHN2Qnyi/Ni2t3Rt YPlHpaPHofAtz64b6c8wOfQLpCEJ251B8B29TSZjnUyEUpX/53hWcRJGl6teKyNyQssf1lW82 bdnQDzYpsdX6Lnam0wLETCikvz/ACRsoUUUF/c+Unxb9cjZoofyYwOQ1kxc4eUHSo3DAZTVz6 IZ03VMd0/n2k3jj7zV1UgqFQzm/663apLTnwty97qC1U9q6XGTa5w6H+iIrT9NnQSSt5axmLE jPOORlS3B9AV0UWGHGrcJnTURhKqukkRm3fhfTna5vfomHjwsAwTiDMbLSfHGR3Uomz3oiHik deBzaNHvav5I/kfZ6Vu8mKaZgIkQUsfyrKoyuc6UX5/04e8HR7CZJXwClT40RadNwvHmyJopE a6lvr/xA3VUD9IS/jYV4mZUl/s2AZKNxIaoUUHOKj3bUCSjyDAu3aXJmZyClnVNRFJJzE1MfS U0wgoKsBsalriHX8ANblgAHAoG1d40ARVixdH0V5wKoo9MrJStYkFQCw4uQpFEYw3IdtANFSc lhzAGYf2tjWK+02USx4DMU5Cd44teFztvpsRPQJDydn6QBZZZtlkWNckW7goSj0nBvGnjOz4f ac1DDn/9Qb0NbKof5NBIs2aFCa+G6N+N7OiU7xQLfh7+vKwDS4QwQUgxMH/dEbBCRzwbX7d7G X7oqm6hGZm31Cp2dLmjyiKSIL5XOB2yvbJgEkeKpXpIJ6CKyMYLRdbrgkbTPy7xPBMcYs+cH6 OXJ5JeRvdcNBXYv3pm/FfC0ok+xcNVnAGgP3SQ== 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 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. Signed-off-by: Arnd Bergmann --- MAINTAINERS | 16 +++++++---- drivers/isdn/Kconfig | 27 ------------------ drivers/isdn/Makefile | 3 -- drivers/isdn/hardware/Makefile | 1 - drivers/staging/Kconfig | 2 ++ drivers/staging/Makefile | 1 + .../staging/isdn/Documentation}/CREDITS | 0 .../isdn/Documentation}/INTERFACE.CAPI | 0 .../staging/isdn/Documentation}/README.avmb1 | 0 .../isdn/Documentation}/README.gigaset | 0 .../staging/isdn/Documentation}/README.hysdn | 0 drivers/staging/isdn/Kconfig | 28 +++++++++++++++++++ drivers/staging/isdn/Makefile | 9 ++++++ drivers/staging/isdn/TODO | 22 +++++++++++++++ .../hardware => staging/isdn}/avm/Kconfig | 0 .../hardware => staging/isdn}/avm/Makefile | 2 ++ .../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/capi/Kconfig | 0 drivers/{ => staging}/isdn/capi/Makefile | 2 ++ drivers/{ => staging}/isdn/capi/capi.c | 0 drivers/{ => staging}/isdn/capi/capilib.c | 0 drivers/{ => staging}/isdn/capi/capiutil.c | 0 drivers/{ => staging}/isdn/capi/kcapi.c | 0 drivers/{ => staging}/isdn/capi/kcapi.h | 0 drivers/{ => staging}/isdn/capi/kcapi_proc.c | 0 drivers/{ => staging}/isdn/gigaset/Kconfig | 0 drivers/{ => staging}/isdn/gigaset/Makefile | 2 ++ .../{ => staging}/isdn/gigaset/asyncdata.c | 0 .../{ => staging}/isdn/gigaset/bas-gigaset.c | 0 drivers/{ => staging}/isdn/gigaset/capi.c | 0 drivers/{ => staging}/isdn/gigaset/common.c | 0 drivers/{ => staging}/isdn/gigaset/ev-layer.c | 0 drivers/{ => staging}/isdn/gigaset/gigaset.h | 0 .../{ => staging}/isdn/gigaset/interface.c | 0 drivers/{ => staging}/isdn/gigaset/isocdata.c | 0 drivers/{ => staging}/isdn/gigaset/proc.c | 0 .../{ => staging}/isdn/gigaset/ser-gigaset.c | 0 .../{ => staging}/isdn/gigaset/usb-gigaset.c | 0 drivers/{ => staging}/isdn/hysdn/Kconfig | 0 drivers/{ => staging}/isdn/hysdn/Makefile | 2 ++ 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 .../staging/isdn/include}/linux/b1lli.h | 0 .../staging/isdn/include}/linux/gigaset_dev.h | 0 .../isdn/include}/linux/isdn/capilli.h | 0 .../isdn/include}/linux/isdn/capiutil.h | 0 .../isdn/include}/uapi/linux/isdn/capicmd.h | 0 66 files changed, 81 insertions(+), 36 deletions(-) rename {Documentation/isdn => drivers/staging/isdn/Documentation}/CREDITS (100%) rename {Documentation/isdn => drivers/staging/isdn/Documentation}/INTERFACE.CAPI (100%) rename {Documentation/isdn => drivers/staging/isdn/Documentation}/README.avmb1 (100%) rename {Documentation/isdn => drivers/staging/isdn/Documentation}/README.gigaset (100%) rename {Documentation/isdn => drivers/staging/isdn/Documentation}/README.hysdn (100%) 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 (86%) 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/capi/Kconfig (100%) rename drivers/{ => staging}/isdn/capi/Makefile (83%) rename drivers/{ => staging}/isdn/capi/capi.c (100%) rename drivers/{ => staging}/isdn/capi/capilib.c (100%) rename drivers/{ => staging}/isdn/capi/capiutil.c (100%) rename drivers/{ => staging}/isdn/capi/kcapi.c (100%) rename drivers/{ => staging}/isdn/capi/kcapi.h (100%) rename drivers/{ => staging}/isdn/capi/kcapi_proc.c (100%) rename drivers/{ => staging}/isdn/gigaset/Kconfig (100%) rename drivers/{ => staging}/isdn/gigaset/Makefile (82%) rename drivers/{ => staging}/isdn/gigaset/asyncdata.c (100%) rename drivers/{ => staging}/isdn/gigaset/bas-gigaset.c (100%) rename drivers/{ => staging}/isdn/gigaset/capi.c (100%) rename drivers/{ => staging}/isdn/gigaset/common.c (100%) rename drivers/{ => staging}/isdn/gigaset/ev-layer.c (100%) rename drivers/{ => staging}/isdn/gigaset/gigaset.h (100%) rename drivers/{ => staging}/isdn/gigaset/interface.c (100%) rename drivers/{ => staging}/isdn/gigaset/isocdata.c (100%) rename drivers/{ => staging}/isdn/gigaset/proc.c (100%) rename drivers/{ => staging}/isdn/gigaset/ser-gigaset.c (100%) rename drivers/{ => staging}/isdn/gigaset/usb-gigaset.c (100%) rename drivers/{ => staging}/isdn/hysdn/Kconfig (100%) rename drivers/{ => staging}/isdn/hysdn/Makefile (79%) 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%) rename {include/uapi => drivers/staging/isdn/include}/linux/b1lli.h (100%) rename {include/uapi => drivers/staging/isdn/include}/linux/gigaset_dev.h (100%) rename {include => drivers/staging/isdn/include}/linux/isdn/capilli.h (100%) rename {include => drivers/staging/isdn/include}/linux/isdn/capiutil.h (100%) rename {include => drivers/staging/isdn/include}/uapi/linux/isdn/capicmd.h (100%) -- 2.20.0 diff --git a/MAINTAINERS b/MAINTAINERS index 1e3a739f0145..c090207ab4fa 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -6556,9 +6556,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 @@ -8236,18 +8234,26 @@ 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: Documentation/isdn/ +F: drivers/staging/isdn/ F: drivers/isdn/ F: include/linux/isdn/ F: include/uapi/linux/isdn/ +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: drivers/staging/isdn/ + IT87 HARDWARE MONITORING DRIVER M: Jean Delvare L: linux-hwmon@vger.kernel.org diff --git a/drivers/isdn/Kconfig b/drivers/isdn/Kconfig index 161f7527df70..7e21b5c4b9b0 100644 --- a/drivers/isdn/Kconfig +++ b/drivers/isdn/Kconfig @@ -20,33 +20,6 @@ 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..0bdadffeb939 100644 --- a/drivers/isdn/Makefile +++ b/drivers/isdn/Makefile @@ -3,8 +3,5 @@ # Object files in subdirectories -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/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/Documentation/isdn/CREDITS b/drivers/staging/isdn/Documentation/CREDITS similarity index 100% rename from Documentation/isdn/CREDITS rename to drivers/staging/isdn/Documentation/CREDITS diff --git a/Documentation/isdn/INTERFACE.CAPI b/drivers/staging/isdn/Documentation/INTERFACE.CAPI similarity index 100% rename from Documentation/isdn/INTERFACE.CAPI rename to drivers/staging/isdn/Documentation/INTERFACE.CAPI diff --git a/Documentation/isdn/README.avmb1 b/drivers/staging/isdn/Documentation/README.avmb1 similarity index 100% rename from Documentation/isdn/README.avmb1 rename to drivers/staging/isdn/Documentation/README.avmb1 diff --git a/Documentation/isdn/README.gigaset b/drivers/staging/isdn/Documentation/README.gigaset similarity index 100% rename from Documentation/isdn/README.gigaset rename to drivers/staging/isdn/Documentation/README.gigaset diff --git a/Documentation/isdn/README.hysdn b/drivers/staging/isdn/Documentation/README.hysdn similarity index 100% rename from Documentation/isdn/README.hysdn rename to drivers/staging/isdn/Documentation/README.hysdn diff --git a/drivers/staging/isdn/Kconfig b/drivers/staging/isdn/Kconfig new file mode 100644 index 000000000000..77e1b80af716 --- /dev/null +++ b/drivers/staging/isdn/Kconfig @@ -0,0 +1,28 @@ +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/staging/isdn/capi/Kconfig" + +source "drivers/staging/isdn/avm/Kconfig" + +source "drivers/staging/isdn/gigaset/Kconfig" + +source "drivers/staging/isdn/hysdn/Kconfig" + + +endif # ISDN_CAPI + diff --git a/drivers/staging/isdn/Makefile b/drivers/staging/isdn/Makefile new file mode 100644 index 000000000000..c5e8b8004f65 --- /dev/null +++ b/drivers/staging/isdn/Makefile @@ -0,0 +1,9 @@ +# SPDX-License-Identifier: GPL-2.0 +# Makefile for the kernel ISDN subsystem and device drivers. + +# Object files in subdirectories + +obj-$(CONFIG_ISDN_CAPI) += capi/ +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 86% rename from drivers/isdn/hardware/avm/Makefile rename to drivers/staging/isdn/avm/Makefile index 3830a0573fcc..fa59f7e38e8a 100644 --- a/drivers/isdn/hardware/avm/Makefile +++ b/drivers/staging/isdn/avm/Makefile @@ -10,3 +10,5 @@ obj-$(CONFIG_ISDN_DRV_AVMB1_AVM_CS) += avm_cs.o obj-$(CONFIG_ISDN_DRV_AVMB1_T1ISA) += t1isa.o b1.o obj-$(CONFIG_ISDN_DRV_AVMB1_T1PCI) += t1pci.o b1.o b1dma.o obj-$(CONFIG_ISDN_DRV_AVMB1_C4) += c4.o b1.o + +ccflags-y += -I$(srctree)/$(src)/../include -I$(srctree)/$(src)/../include/uapi 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/capi/Kconfig b/drivers/staging/isdn/capi/Kconfig similarity index 100% rename from drivers/isdn/capi/Kconfig rename to drivers/staging/isdn/capi/Kconfig diff --git a/drivers/isdn/capi/Makefile b/drivers/staging/isdn/capi/Makefile similarity index 83% rename from drivers/isdn/capi/Makefile rename to drivers/staging/isdn/capi/Makefile index 06da3ed2c40a..d299f3e75f89 100644 --- a/drivers/isdn/capi/Makefile +++ b/drivers/staging/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/capi/capi.c b/drivers/staging/isdn/capi/capi.c similarity index 100% rename from drivers/isdn/capi/capi.c rename to drivers/staging/isdn/capi/capi.c diff --git a/drivers/isdn/capi/capilib.c b/drivers/staging/isdn/capi/capilib.c similarity index 100% rename from drivers/isdn/capi/capilib.c rename to drivers/staging/isdn/capi/capilib.c diff --git a/drivers/isdn/capi/capiutil.c b/drivers/staging/isdn/capi/capiutil.c similarity index 100% rename from drivers/isdn/capi/capiutil.c rename to drivers/staging/isdn/capi/capiutil.c diff --git a/drivers/isdn/capi/kcapi.c b/drivers/staging/isdn/capi/kcapi.c similarity index 100% rename from drivers/isdn/capi/kcapi.c rename to drivers/staging/isdn/capi/kcapi.c diff --git a/drivers/isdn/capi/kcapi.h b/drivers/staging/isdn/capi/kcapi.h similarity index 100% rename from drivers/isdn/capi/kcapi.h rename to drivers/staging/isdn/capi/kcapi.h diff --git a/drivers/isdn/capi/kcapi_proc.c b/drivers/staging/isdn/capi/kcapi_proc.c similarity index 100% rename from drivers/isdn/capi/kcapi_proc.c rename to drivers/staging/isdn/capi/kcapi_proc.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 82% rename from drivers/isdn/gigaset/Makefile rename to drivers/staging/isdn/gigaset/Makefile index f8ba14735bf1..bb180ca27fdb 100644 --- a/drivers/isdn/gigaset/Makefile +++ b/drivers/staging/isdn/gigaset/Makefile @@ -8,3 +8,5 @@ obj-$(CONFIG_ISDN_DRV_GIGASET) += gigaset.o obj-$(CONFIG_GIGASET_M105) += usb_gigaset.o obj-$(CONFIG_GIGASET_BASE) += bas_gigaset.o obj-$(CONFIG_GIGASET_M101) += ser_gigaset.o + +ccflags-y += -I$(srctree)/$(src)/../include -I$(srctree)/$(src)/../include/uapi 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/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 79% rename from drivers/isdn/hysdn/Makefile rename to drivers/staging/isdn/hysdn/Makefile index da63b636267d..23c6159513a8 100644 --- a/drivers/isdn/hysdn/Makefile +++ b/drivers/staging/isdn/hysdn/Makefile @@ -9,3 +9,5 @@ obj-$(CONFIG_HYSDN) += hysdn.o hysdn-y := hysdn_procconf.o hysdn_proclog.o boardergo.o \ hysdn_boot.o hysdn_sched.o hysdn_net.o hysdn_init.o hysdn-$(CONFIG_HYSDN_CAPI) += hycapi.o + +ccflags-y += -I$(srctree)/$(src)/../include -I$(srctree)/$(src)/../include/uapi 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 diff --git a/include/uapi/linux/b1lli.h b/drivers/staging/isdn/include/linux/b1lli.h similarity index 100% rename from include/uapi/linux/b1lli.h rename to drivers/staging/isdn/include/linux/b1lli.h diff --git a/include/uapi/linux/gigaset_dev.h b/drivers/staging/isdn/include/linux/gigaset_dev.h similarity index 100% rename from include/uapi/linux/gigaset_dev.h rename to drivers/staging/isdn/include/linux/gigaset_dev.h diff --git a/include/linux/isdn/capilli.h b/drivers/staging/isdn/include/linux/isdn/capilli.h similarity index 100% rename from include/linux/isdn/capilli.h rename to drivers/staging/isdn/include/linux/isdn/capilli.h diff --git a/include/linux/isdn/capiutil.h b/drivers/staging/isdn/include/linux/isdn/capiutil.h similarity index 100% rename from include/linux/isdn/capiutil.h rename to drivers/staging/isdn/include/linux/isdn/capiutil.h diff --git a/include/uapi/linux/isdn/capicmd.h b/drivers/staging/isdn/include/uapi/linux/isdn/capicmd.h similarity index 100% rename from include/uapi/linux/isdn/capicmd.h rename to drivers/staging/isdn/include/uapi/linux/isdn/capicmd.h