From patchwork Tue Apr 23 15:11:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 162705 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp3900359jan; Tue, 23 Apr 2019 08:12:15 -0700 (PDT) X-Google-Smtp-Source: APXvYqzoYMP+6tPs8pcq1x3qIwWHc2DDnpvUabyIVQBvr+Jd/UEJU61TMiTAy6M5H8IWpoV9/t4V X-Received: by 2002:a62:a513:: with SMTP id v19mr27050569pfm.212.1556032335670; Tue, 23 Apr 2019 08:12:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556032335; cv=none; d=google.com; s=arc-20160816; b=JFRT/goJYJ5nWLQ3n/DAyc1IctOooWtVFj1OoYqP9RVcDVbiL69/V3gEn6bm8yNrvD Xb/HU1xHgZhXdHx+B705K5cv+O16mW3HgQ2kD6D65R/Nh5OmDt7GAB23fggGIOhaR7QN S50BJnl7YBuwu63h72z0JSU2pJrhb86fGPqohFaRbKn+A1286ErrvmsNa01zpQfSYJac 4YUo+EUJFYQxQhw3NVXkeV3sX9L+2YrjOa5gCTekuwHG/H/QFlRnPWLcaEieS3/SUHqE 2IVnlSQDaNoVLlpd3ndWHqZom+MnFbmiFnU2ZMcvuU5HYpnZjdDvdCgSp002Ot1R5DOU HgtQ== 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=gv9m2Su1NlKFXiNqNLLXZO+evbdpMS+bDwb9oa7K/lw0O+bjWp1ghYyqlXMOCgmQZn papFUQEFL88nk/HlG81hDqKWmHC1leM47nE/AC3Mn0pedsueacJZSZWbHca9RYd+1+wv +5FbiFpPEr7+h+jPULPsC14xi1uC37IX95ShVo15iili/Ys1RwtcUt59MSXLATSeBHxF symxnrWiwUQ9V0f95Yh9kUE4BC9+gnxtffOl2n4fQ4PqFN1K7TzIHGtrs55nGjwqS57b Zgr19bADCGeRSFt84yahPBLV3H6DmxhEhg9T678G6H5PE2riohdFMQ44zBgoUZxSUtu7 EyOA== 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.15; Tue, 23 Apr 2019 08:12:15 -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 S1728212AbfDWPMN (ORCPT + 9 others); 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 X-Provags-ID: V03:K1:p83VG7RSop2E3Xfg8cj+qTAB3flKTSxE3LjvDIiJCaNlN33i4yv QvUnbXNkR0VXdayOf+ZVU8r7I0af31uH3kxc1KoyZnEKD4itzNx6JPxhZKbPTthBnmW/P5/ UrrEaxVianTawj8ehzz0RLBchRYj4LtWUcHfY8gB1T/OQVNJvQ5DaFCqrZ5Z0wdtcCQyxTl vqCEb95+zkZbK+eOp0WdQ== X-Spam-Flag: NO 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/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"