From patchwork Tue Apr 23 15:11:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 162714 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp3900833jan; Tue, 23 Apr 2019 08:12:38 -0700 (PDT) X-Google-Smtp-Source: APXvYqxy4+vKLGbPyY2OPeRLuBTyBhS9hr8p2u50SNtg8ifsJQDVmRnnSficiorJMv8fj0qMSRPO X-Received: by 2002:a62:a513:: with SMTP id v19mr27052584pfm.212.1556032358368; Tue, 23 Apr 2019 08:12:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556032358; cv=none; d=google.com; s=arc-20160816; b=UIkmGPJ+1gQDlptFXK76JbICtw0qlYU+HPsK7ivdmDGTifPe+8Zo1D3FHrwivJcwL0 rbBHARQevdHuh7uGdZ0O0+4bp7L7o6vg9rmFBBTaDsxT85JAEM4oWX5+stZvQrWCPZbu bQ7XYCfb2JSzhznTHSOLk9L+muPTq5Z0p85WQkzhB0muGzVbWU6U2aYlw7a3bHTwXB+p nWxKwRVHs5vqoguCOaFSbdLlovdEoQ3tN/TWJIHTzI0xyW8zcn+SwVmjNfKTGSmgbbwz ahxKuW+Xuokztq46suEyPRnAoGTWdq7PhZBRFTU9BC2bQwyr0iRU7i1OiJAkDJ4meJbj Wn5Q== 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=AgNeyBzj2DM9wUqFNZDCsFTIK5r2Mv9MqSoQpfH1Mhh2H+cDlgrW8fvWT/PE2vibBd CAdhmC+N9vZTyYPuzRodQ8mG03axxFG6XocyBsaKpkk4EidYJaYYC/nlWuIq0pR/rlW7 7noO4ZrxWIlFkiDP5W/ffMRgSx/yZbcyjryG5i8xgFp/SJnA3qw8thYimzPpv9kS2Iao naEpu3TZ6U+Q0ucHcQXhcQ9WE0CvmkjxF9a87BhqBb2Zbf3th71ruhlE2zx/BBfYWSET tznfOU5OO9KYnDs8WMXEzI9rdELDiMzEZ+4rwtGl7n0my/XkQwcd4kQOL2lyo5f67l1X JonA== 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.38; Tue, 23 Apr 2019 08:12:38 -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 S1728425AbfDWPMh (ORCPT + 9 others); Tue, 23 Apr 2019 11:12:37 -0400 Received: from mout.kundenserver.de ([217.72.192.75]:54595 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728222AbfDWPMP (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 1MtwQk-1gyFwA1nno-00uKcZ; 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 1/5] isdn: gigaset: remove i4l support Date: Tue, 23 Apr 2019 17:11:33 +0200 Message-Id: <20190423151143.464992-2-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:EC/9nSNz1pPqaBTt9HCP9x9RvEWjBFq9ZMh8St+1g3O83zi3QZC SG/mT24y5Dglklzg5zi087HdU8lTxr0GFhe0EJhfjK+ql+BMzeOl93wRXZDviIv17FWr7jd 2ysUuomJmUeN2hLnI7oBgGoJfnw9s3KKiFqC1zcM1+I2cCH6g/dte9SrRKBFx3PZsoX6EcF DWkCjzm/PJljVf63tUUWw== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:krhX+StLh48=:LHSaqajsZ0H44ypIvk8vlb PqLDGtdvtBX5i5qy8lL8t/PNxnMhAyx3Lrrt383jb2TBq+4wmxPeTUolo+DVMnjifJfCiJdZp u/vzNOGgZ1usTLUYBq00xAdsVmWYKGTbR79tWGs/ldHa8bzN/FNkYTMDktvz22TXu8VwnhNeb IJPn+lEneEAFep3S52BB8DAHa7f80U643waw+kGJTazv0yEun91lDYa69f/9POeBgN0g0Wr4H aQoCkskYbIvTCZlbd6I4J/u/YgP4wUynBujCchdntagvuYGB/SSQIh2kbeDYHVBG/Jv6H2Tj+ zcdJYPqQwlAYM1gguyaqDrLCVT74kCJuT4kBzsQfpSeVOmPp+zoqKAfpgAYW8C3kA+svRBBPx 3cMUVPpqZZNsEVHSQ++WqRe0kChAr4uE0fDrst/GkWT3NzCI/CoOAI+ddonGvhv883Uur6VwV /HlPAnm9e7zCcXlC2UXxiprMUMA3h9YhqIXY+LVpTRKxTVij8M8QqcMgTI8ZBkb2X0kzOq1nF 5+ptv+zbPXtXaU1B0+t752NrFLVvSoQG1GjNBsojQPa0eYoXxvccCeWazJSnIdBPCSqYPSTnL Aj/3WaotOU8baV7TD/xEyQsntD5YujxTQYZk9fQ5LHEwwUahNaiJCYmGM8WhYnBvHxbA33EWA NdgUbJcL9Ce9PBAB8e+bQ/9nHAPOWTyJ06jrHtYTzSsqt/fz57BQHFVQiNALk3z4Axihas3VI GuFzGSoAL/5o4piCCHy/ZUTlr8gL35JXiS0GJA== 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