From patchwork Fri Apr 26 19:58:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 162972 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp1145463jan; Fri, 26 Apr 2019 12:59:54 -0700 (PDT) X-Google-Smtp-Source: APXvYqwn7agmq9ls1GUpOa0fuUsRnVl7QeFF7SyYmeiIilMS4tL+L0HPzsJRrEFGShuO4UaoxVuR X-Received: by 2002:a17:902:2ec5:: with SMTP id r63mr4042928plb.139.1556308794450; Fri, 26 Apr 2019 12:59:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556308794; cv=none; d=google.com; s=arc-20160816; b=M+ttZ2JWHm4Cs8JRzvN59SqE9jqbJGiIyyEDWDOMdgX4PJ1T2e0DhzdOhB4v0YA3AV +v/kMAXF0xm8nbX63+SM8sYPq+N96Ip65oRR7VBV+06QK16geYgCoIFW5nKiGy/FQGvD DM1dDH5WaZxfjcgdRX0U5nO3DYozkSFcwk20ro9DekdG6F1ggGsVdbX1j1TkOUSpDzZF FtQfjTn7KAENcCWMNtFJZ3Zu6SgvtnqMzD7hhNJRWrSydxomllHYS2D4Ae/uJy1TynAk HQAzoaakDBQrI7woppZxRBGjJqjqJ6kmaO6oEalSk8kdcYxZOj4sdE+T+V8igLsCpSVR GWOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=279uK8Nlqas9+dWjVJ7McOkEUvS+A05pPmieJveBYOY=; b=yRjYVtJhNpyNRZe3mnxALAVgekYJS+xuAXl6f2O3jMDTpIPsETYdIF18epftGe1XBP KX6mI9giIi3WF5sot/dK42Adi6ePOk/UIi1lyp1Dgx358Na79Ey0BXbfJnH0dPuQxj72 3Uy1FhoDGm/wmjZm99Cdlq1RCCGUOvuqN7UKa4jHtpy6iG30lZDmHeSSwCspHx5++YX0 LOAcXa8YnXOjBNZMUlNwKkOiB8IK3o3mBxeQUtdV/k79/Juf6RLLUCaeqLvTChV/7lsT 8IIKVs/Bz30L3Y2e7RVelgA43GF01BLJ4BqnqIEGpNu6MQwO2c44zLAHsN3KQpnXk3FI CagA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of netdev-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id x18si3484640pff.280.2019.04.26.12.59.54; Fri, 26 Apr 2019 12:59:54 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of netdev-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of netdev-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726809AbfDZT7x (ORCPT + 9 others); Fri, 26 Apr 2019 15:59:53 -0400 Received: from mout.kundenserver.de ([217.72.192.73]:33185 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726734AbfDZT7w (ORCPT ); Fri, 26 Apr 2019 15:59:52 -0400 Received: from threadripper.lan ([149.172.19.189]) by mrelayeu.kundenserver.de (mreue108 [212.227.15.145]) with ESMTPA (Nemesis) id 1Mo73N-1gzcAV0f0N-00pdxb; Fri, 26 Apr 2019 21:58:56 +0200 From: Arnd Bergmann To: netdev@vger.kernel.org Cc: isdn4linux@listserv.isdn4linux.de, Karsten Keil , Paul Bolle , Holger Schurig , Tilman Schmidt , Al Viro , gigaset307x-common@lists.sourceforge.net, arnd@arndb.de, Thomas Jarosch , Birger Harzenetter Subject: [PATCH v2 1/5] isdn: gigaset: remove i4l support Date: Fri, 26 Apr 2019 21:58:45 +0200 Message-Id: <20190426195849.4111040-2-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 In-Reply-To: <20190426195849.4111040-1-arnd@arndb.de> References: <20190426195849.4111040-1-arnd@arndb.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:YIxyVJQYanhFH+Za4b+Xd8St4XLAzUSJKrRogZlMFNArt3c90Wj aYFbzvgBtO6r9qyp6F00d7KKctGDIrGfF08kb/Eg71yWYKXl2O9swUgH0VRbkMM5gaiH2eT s7ka246KqVmNb7LIviOlrJZ41wAmZHMvJwUqhUwP3w5dK5kqUGJ6HhEzUqSU7fvSjv3ivsV DEAo3X3KyUyihb3DDG5lQ== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:6UBS3gQ2Svs=:t4XiNTXPBzZ9PXPMqxyIMn J2F7YWFbTQ+aCcpVx8zWKroBd7+qsJ9TvOt9Sj5NVz49uD4tfQu1q2IZcS6/fSvo7Hxhh59wf F/5zHYpS8swKHBVs/Lt5KFSdVefKmRrMRwDy91yVI9LZ4Duv/UziffpAbZdILpgGQotAVk7BA S/qnfonK7DTSj3gd8Pf8lZL4NrFD61+kACN2C/FDiscaZziZeXIjXuKTBtD2BG9ZmpB717Bki CtIla79UfYOsodC9cM0rsr49+rHKgpd97pzuGQD4f0tTaymfkih/3MC6me/AyJVVwwZ8AWOgE CpkPUvnpu+MErmMC7lxBAde3VWm0TD4VbUS7gKdQ2XaWtuGNWuVxRZrZ5sSs+vytW8ETJswzq NQmWgRiAhXcLbrA7JjX0/jzoG/2/wD3rQGTc/cUoXNWFPANjnHO5JWGc1ExEGF2zlDqjAUMKV xmS9T4M0v/iVdWo5Z3Zg3vxGBBc6tZrCz/VSY/gyqjMFuIuLrSLGwFvzkJgIrZkxUROUlNhl+ TrBZOC92IXCspV32sNmVo1RFMN0+eZGVHXp/+3vjLeqYqNR+sp8Gax98M+h9NaIYUDIZhoM2R TMJhghdSQCo5//qbodd/xZDfGeF6TcW1FCnZoNLowrJ84car7bdsYX3JsSEuhSqSB4KNK3/fo GeJGN97jzvaqPKU8hf2BEJyvCXHWHZqccqf+fdDcB3cdK7t6/lYb6hgfWZ4fQOnZkRP6doWUM T09lIg6KP2nyFcFWvWovijIS68vvo5z5KJipsA== Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org isdn4linux is getting removed, and the gigaset driver can still use the CAPI support, so this can all go away. Signed-off-by: Arnd Bergmann --- Documentation/isdn/README.gigaset | 36 +- drivers/isdn/gigaset/Kconfig | 9 - drivers/isdn/gigaset/Makefile | 10 +- drivers/isdn/gigaset/i4l.c | 695 ------------------------------ 4 files changed, 15 insertions(+), 735 deletions(-) delete mode 100644 drivers/isdn/gigaset/i4l.c diff --git a/drivers/isdn/gigaset/i4l.c b/drivers/isdn/gigaset/i4l.c deleted file mode 100644 index b5b389e95edd..000000000000 -- 2.20.0 diff --git a/Documentation/isdn/README.gigaset b/Documentation/isdn/README.gigaset index 9b1ce277ca3d..f6184b637182 100644 --- a/Documentation/isdn/README.gigaset +++ b/Documentation/isdn/README.gigaset @@ -48,9 +48,8 @@ GigaSet 307x Device Driver 1.2. Software -------- - The driver works with the Kernel CAPI subsystem as well as the old - ISDN4Linux subsystem, so it can be used with any software which is able - to use CAPI 2.0 or ISDN4Linux for ISDN connections (voice or data). + The driver works with the Kernel CAPI subsystem and can be used with any + software which is able to use CAPI 2.0 for ISDN connections (voice or data). There are some user space tools available at https://sourceforge.net/projects/gigaset307x/ @@ -92,7 +91,7 @@ GigaSet 307x Device Driver gigaset debug debug level (see section 3.2.) startmode initial operation mode (see section 2.5.): - bas_gigaset ) 1=ISDN4linux/CAPI (default), 0=Unimodem + bas_gigaset ) 1=CAPI (default), 0=Unimodem ser_gigaset ) usb_gigaset ) cidmode initial Call-ID mode setting (see section 2.5.): 1=on (default), 0=off @@ -154,18 +153,10 @@ GigaSet 307x Device Driver 2.3. CAPI ---- - If the driver is compiled with CAPI support (kernel configuration option - GIGASET_CAPI) the devices will show up as CAPI controllers as soon as the - corresponding driver module is loaded, and can then be used with CAPI 2.0 - kernel and user space applications. For user space access, the module - capi.ko must be loaded. - - Legacy ISDN4Linux applications are supported via the capidrv - compatibility driver. The kernel module capidrv.ko must be loaded - explicitly with the command - modprobe capidrv - if needed, and cannot be unloaded again without unloading the driver - first. (These are limitations of capidrv.) + The devices will show up as CAPI controllers as soon as the + corresponding driver module is loaded, and can then be used with + CAPI 2.0 kernel and user space applications. For user space access, + the module capi.ko must be loaded. Most distributions handle loading and unloading of the various CAPI modules automatically via the command capiinit(1) from the capi4k-utils @@ -173,16 +164,6 @@ GigaSet 307x Device Driver Gigaset drivers because it doesn't support more than one module per driver. -2.4. ISDN4Linux - ---------- - If the driver is compiled without CAPI support (native ISDN4Linux - variant), it registers the device with the legacy ISDN4Linux subsystem - after loading the module. It can then be used with ISDN4Linux - applications only. Most distributions provide some configuration utility - for setting up that subsystem. Otherwise you can use some HOWTOs like - http://www.linuxhaven.de/dlhp/HOWTO/DE-ISDN-HOWTO-5.html - - 2.5. Unimodem mode ------------- In this mode the device works like a modem connected to a serial port @@ -281,8 +262,7 @@ GigaSet 307x Device Driver number. Dialing "***" (three asterisks) calls all extensions simultaneously (global call). - This holds for both CAPI 2.0 and ISDN4Linux applications. Unimodem mode - does not support internal calls. + Unimodem mode does not support internal calls. 2.8. Unregistered Wireless Devices (M101/M105) ----------------------------------------- diff --git a/drivers/isdn/gigaset/Kconfig b/drivers/isdn/gigaset/Kconfig index 83f62b8d82b5..395df5ffb6b0 100644 --- a/drivers/isdn/gigaset/Kconfig +++ b/drivers/isdn/gigaset/Kconfig @@ -29,15 +29,6 @@ config GIGASET_CAPI Say N to build the old native ISDN4Linux variant. If unsure, say Y. -config GIGASET_I4L - bool - depends on ISDN_I4L='y'||(ISDN_I4L='m'&&ISDN_DRV_GIGASET='m') - default !GIGASET_CAPI - -config GIGASET_DUMMYLL - bool - default !GIGASET_CAPI&&!GIGASET_I4L - config GIGASET_BASE tristate "Gigaset base station support" depends on USB diff --git a/drivers/isdn/gigaset/Makefile b/drivers/isdn/gigaset/Makefile index ac45a2739f56..9c010891dcd7 100644 --- a/drivers/isdn/gigaset/Makefile +++ b/drivers/isdn/gigaset/Makefile @@ -1,8 +1,12 @@ # SPDX-License-Identifier: GPL-2.0 gigaset-y := common.o interface.o proc.o ev-layer.o asyncdata.o -gigaset-$(CONFIG_GIGASET_CAPI) += capi.o -gigaset-$(CONFIG_GIGASET_I4L) += i4l.o -gigaset-$(CONFIG_GIGASET_DUMMYLL) += dummyll.o + +ifdef CONFIG_GIGASET_CAPI +gigaset-y += capi.o +else +gigaset-y += dummyll.o +endif + usb_gigaset-y := usb-gigaset.o ser_gigaset-y := ser-gigaset.o bas_gigaset-y := bas-gigaset.o isocdata.o