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