From patchwork Fri Apr 26 19:58:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 162970 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp1145404jan; Fri, 26 Apr 2019 12:59:50 -0700 (PDT) X-Google-Smtp-Source: APXvYqy176FczEzpkymugV5HUCVGBVzmdD2ec2hVvCZmNkJM/WHpT7qRMBnKPtFIsRAWNsXVL49a X-Received: by 2002:a63:cc48:: with SMTP id q8mr16415046pgi.202.1556308790278; Fri, 26 Apr 2019 12:59:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556308790; cv=none; d=google.com; s=arc-20160816; b=OJKjdB4MUyNVi/05alZWXfVgnAbIytcQ+mzFzyJcpEwfdy4vgayQLCsoq9HusMzbVO FwsSPzKyY+tpysczrZ01hymdKJCykb/879VYycqnha5XMSyQP7yZZTkVYHWjYN0AWPrH 5qWGqgH+ATwggGaBmBv8POiPcyF+P3XKKW/RUjVYM2d9CO/sxUdE8SAIur6TYkdb+lM9 kzn3DaVrLMU+TbzFU4FsIpR40+eWk9vtlt2/fGQ7+eZ/8mXG928OtFxjPY7cUlu28PG0 AAvwpDAdoeczpN+1NP/6ehReXtEUPsXDJXrG3W+CgB327G3GhAQ9NlOI3J5uKp/6sfis Mcog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=dmdQ9we9NmnQe2tciFbm4WjFsLNarw2C+FlRghNI1MU=; b=m3gDunKezIT/XAxe9cMtQUvciYWJojxoclV1u5/gFUp2d4L9ehhJI3f8Uq48FpYQk3 7cYO+lb29xUYMexUsdD64wSjLN2udP5jMOmwfRDVXHI5Z1wtM6ED2gjA+VRiu7911aA0 CseFmv7e4dr785wcgAUjIVyBPr5SqkQ5Af8hCnBOdtQeuW1AVqZYbSCnSESWg7a4sXw6 lCuIJ+xFI0BMdi6aZTMpvNxjUSL7OaToGWwq6EF6D+xqlOS81Vr5qaPFzyqmMZ8U5re2 6XUlj2gZNCw8DiH5SeB/MnPCT479y8CSsUaJHWuhKk9l9XznrbGUt3SrZzU1IJ9U6moF /vDA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of netdev-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id x18si3484640pff.280.2019.04.26.12.59.50; Fri, 26 Apr 2019 12:59:50 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of netdev-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of netdev-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726696AbfDZT7t (ORCPT + 9 others); Fri, 26 Apr 2019 15:59:49 -0400 Received: from mout.kundenserver.de ([212.227.17.24]:41549 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726400AbfDZT7s (ORCPT ); Fri, 26 Apr 2019 15:59:48 -0400 Received: from threadripper.lan ([149.172.19.189]) by mrelayeu.kundenserver.de (mreue108 [212.227.15.145]) with ESMTPA (Nemesis) id 1Mate1-1gmQsE1kWR-00cUnT; Fri, 26 Apr 2019 21:58:57 +0200 From: Arnd Bergmann To: netdev@vger.kernel.org Cc: isdn4linux@listserv.isdn4linux.de, Karsten Keil , Paul Bolle , Holger Schurig , Tilman Schmidt , Al Viro , gigaset307x-common@lists.sourceforge.net, arnd@arndb.de, Thomas Jarosch , Birger Harzenetter Subject: [PATCH v2 4/5] isdn: hdlc: move into mISDN Date: Fri, 26 Apr 2019 21:58:48 +0200 Message-Id: <20190426195849.4111040-5-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 In-Reply-To: <20190426195849.4111040-1-arnd@arndb.de> References: <20190426195849.4111040-1-arnd@arndb.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:9bb30L3O4c5RkdBhDQfpSd6FaKZ146N26N4nMfFsAPoxAOJjMkJ QTlYwIBNj+jnsOlPZN59CdkwWJiQWrrcG1UWzN4UN9pv1sCA/HjMFBrHTmi5j6TTHFrAsaR G778mp+CIYePJCMScEvg+74IpF/Kwlxqn8oYU858FMkvONWEyFwdYsXXgkZuikuHgUGUOsY hOipzi70eBlzWJEQS6GIw== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:dvIUgAv4MeY=:JIBCGTnnWaQgEfUMQY9izX kp8DDvsCj/KKeWi4jLbn0Uewboz9vkGq/Po/ylKohsLKRvwpdeuaD5gMtVsOuvObDPjxG+lIh pC6IMgCJlI5pqARJEV7R77QEmhw1/pkw0A/5BazuOKbJZ6iqMGAQv6XX2R4clPKgO72O/nHB5 a8mGied7aWts8zWkcT7GxGhwWE8liIN2YJn8NbkTvsagHi4Re3co5/c+JbVGYMaGUdz7pK3BK hM9OOKSWzr0jv8pfvPzqiNGb2CMelmECEJ7lF4fbwD6QA1bie+G0YR8+13CP0tHDk0u05w+CG ddCxganlM0fp//rMzZiQfkmj7gOmrbcRdGL8/M2f1g/kWVNe8ZW4sIXJ3AkyGp4ovLldLEMtF BLHf0ORSIkEaAkhKXv8hMOUpdGh0jqBGFmf4EYKZZ/+Wgi5LKLM+L+kn6q91OOkTB+ssahT9T YqSUbJ2XXTpIqPGBrwIhksWe6r35f4Z2fUszNjIlWG79rNPKD+K1+0et4tu/uDlFXI9/tGXfd Zsagt8UiFbd6GH8xkx1ezQ8t5ibQfONSI8NRvJdI1OOojYAAZNk2ppOvBzExC4s9qCYzM3Mx7 gRi0QHLDZnKzXkZyDQGD2c16wz/BIy3L453oxjiDuliJleypGm4pOePjbl64R8kxlL4AwZG6T kqqLJiLpSnJTybLLHU2CmaNNJbHaXHACS5vyINBt0394Rc3qmuiqjnTa4HeD5sww9bRog0bfO Ty7LX1Rx3SuNQB8GDbUiQuZIWEvwtpxfWB6O5Q== Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The last remnant of the isdn4linux interface is now the isdnhdlc support, used by the netjet driver. Move it next to that driver. Signed-off-by: Arnd Bergmann --- drivers/isdn/Makefile | 1 - drivers/isdn/hardware/mISDN/Kconfig | 7 +++++-- drivers/isdn/hardware/mISDN/Makefile | 2 ++ drivers/isdn/{i4l => hardware/mISDN}/isdnhdlc.c | 2 +- .../isdn/hdlc.h => drivers/isdn/hardware/mISDN/isdnhdlc.h | 0 drivers/isdn/hardware/mISDN/netjet.c | 2 +- drivers/isdn/i4l/Makefile | 6 ------ 7 files changed, 9 insertions(+), 11 deletions(-) rename drivers/isdn/{i4l => hardware/mISDN}/isdnhdlc.c (99%) rename include/linux/isdn/hdlc.h => drivers/isdn/hardware/mISDN/isdnhdlc.h (100%) delete mode 100644 drivers/isdn/i4l/Makefile diff --git a/drivers/isdn/i4l/Makefile b/drivers/isdn/i4l/Makefile deleted file mode 100644 index 11fe697739d5..000000000000 -- 2.20.0 diff --git a/drivers/isdn/Makefile b/drivers/isdn/Makefile index 379b4a03c321..f2a529c5a511 100644 --- a/drivers/isdn/Makefile +++ b/drivers/isdn/Makefile @@ -3,7 +3,6 @@ # Object files in subdirectories -obj-$(CONFIG_ISDN_I4L) += i4l/ obj-$(CONFIG_ISDN_CAPI) += capi/ obj-$(CONFIG_MISDN) += mISDN/ obj-$(CONFIG_ISDN) += hardware/ diff --git a/drivers/isdn/hardware/mISDN/Kconfig b/drivers/isdn/hardware/mISDN/Kconfig index fda912b0833f..da30d85c9236 100644 --- a/drivers/isdn/hardware/mISDN/Kconfig +++ b/drivers/isdn/hardware/mISDN/Kconfig @@ -78,11 +78,14 @@ config MISDN_NETJET depends on PCI depends on TTY select MISDN_IPAC - select ISDN_HDLC - select ISDN_I4L + select MISDN_HDLC help Enable support for Traverse Technologies NETJet PCI cards. +config MISDN_HDLC + tristate + select CRC_CCITT + select BITREVERSE config MISDN_IPAC tristate diff --git a/drivers/isdn/hardware/mISDN/Makefile b/drivers/isdn/hardware/mISDN/Makefile index 422f9fd8ab9a..3f50f8c4753f 100644 --- a/drivers/isdn/hardware/mISDN/Makefile +++ b/drivers/isdn/hardware/mISDN/Makefile @@ -15,3 +15,5 @@ obj-$(CONFIG_MISDN_NETJET) += netjet.o # chip modules obj-$(CONFIG_MISDN_IPAC) += mISDNipac.o obj-$(CONFIG_MISDN_ISAR) += mISDNisar.o + +obj-$(CONFIG_MISDN_HDLC) += isdnhdlc.o diff --git a/drivers/isdn/i4l/isdnhdlc.c b/drivers/isdn/hardware/mISDN/isdnhdlc.c similarity index 99% rename from drivers/isdn/i4l/isdnhdlc.c rename to drivers/isdn/hardware/mISDN/isdnhdlc.c index 027d1c590679..3a8b562e63b1 100644 --- a/drivers/isdn/i4l/isdnhdlc.c +++ b/drivers/isdn/hardware/mISDN/isdnhdlc.c @@ -25,8 +25,8 @@ #include #include #include -#include #include +#include "isdnhdlc.h" /*-------------------------------------------------------------------*/ diff --git a/include/linux/isdn/hdlc.h b/drivers/isdn/hardware/mISDN/isdnhdlc.h similarity index 100% rename from include/linux/isdn/hdlc.h rename to drivers/isdn/hardware/mISDN/isdnhdlc.h diff --git a/drivers/isdn/hardware/mISDN/netjet.c b/drivers/isdn/hardware/mISDN/netjet.c index 2b317cb63d06..93a2d361eda5 100644 --- a/drivers/isdn/hardware/mISDN/netjet.c +++ b/drivers/isdn/hardware/mISDN/netjet.c @@ -29,7 +29,7 @@ #include "ipac.h" #include "iohelper.h" #include "netjet.h" -#include +#include "isdnhdlc.h" #define NETJET_REV "2.0"