Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 37510C10F03 for ; Tue, 23 Apr 2019 15:12:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0D1E7217D9 for ; Tue, 23 Apr 2019 15:12:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728212AbfDWPMN (ORCPT ); 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 Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K1:p83VG7RSop2E3Xfg8cj+qTAB3flKTSxE3LjvDIiJCaNlN33i4yv QvUnbXNkR0VXdayOf+ZVU8r7I0af31uH3kxc1KoyZnEKD4itzNx6JPxhZKbPTthBnmW/P5/ UrrEaxVianTawj8ehzz0RLBchRYj4LtWUcHfY8gB1T/OQVNJvQ5DaFCqrZ5Z0wdtcCQyxTl vqCEb95+zkZbK+eOp0WdQ== 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/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" diff --git a/drivers/isdn/i4l/Makefile b/drivers/isdn/i4l/Makefile deleted file mode 100644 index 11fe697739d5..000000000000 -- 2.20.0