From patchwork Tue Apr 23 15:11:42 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 162715 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp3900901jan; Tue, 23 Apr 2019 08:12:41 -0700 (PDT) X-Google-Smtp-Source: APXvYqxS8p4rs3zRYUuhq7sf2Xex8fPJ56jUH0weVn5Tx/IX/kVD4GVViyalt9YbZ56ZOQVfHkjT X-Received: by 2002:a63:4b15:: with SMTP id y21mr25231399pga.430.1556032361550; Tue, 23 Apr 2019 08:12:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556032361; cv=none; d=google.com; s=arc-20160816; b=dqTQRmflxBEhxMfx1ODQq4b6kP+E1xgP7jpIYuk9vEpxdFrcxjS6EeF7x63sFiR5O1 3J8YIBQpd9f/bit96DHgl4kphXL3CxFf9XgJXjdR6mGGwqYt4Zag9w44WE3Xn4LPjdcg kFprfzMYVXYtLc4kkWykYYNSIi7gYESX3h1vwvyYQkfSplNKUY1KHbR8jPpLI9e3kDcB arPcKSBbkif6s17SdFRf6H959IjvvW3jfAW4rNjq172QdvDl1UfBRfUwIRoN9osgcobf hU3NnhJQnM/TYhjd1FxcYsKqUZTykOl689vsd+ZSDNfZrQsbyMJ1jg1RkoR2fSfHwUbw Umeg== 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=cAfN0Qx3Dff0k3bOn9wmlC2UG+X76w+4uQciPnNqNqJFZUQNjd2N/HMcV2ATuMoSSd nfIikmEi8IYtFHeXRf76ZlZ4W+kcjYGSFdRYtk0BsZ/SmaCZEMYWa4thxttAaXZ20jPF 93zGSvYUj+ERa/Oe5AicAqgduuMeG9CP5RFhzjSnqUOzfGGbr0tvRdhT7Hsi1co1RCo5 Q2BqTPZiklusrJdTK62y3WXD5KJdmPHdZKVLTxECtOjc+dNeZxYmVWdUFlOdXc36UjJA NLvJcCi4EpwPggUS/PQg3b35INKrtjIYsG1ifmDryaxCQDfIypX+s6AYj6XISnTh++7Y Ym7A== 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.41; Tue, 23 Apr 2019 08:12:41 -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 S1728415AbfDWPMf (ORCPT + 9 others); Tue, 23 Apr 2019 11:12:35 -0400 Received: from mout.kundenserver.de ([217.72.192.75]:42153 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727656AbfDWPMP (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 1McH1O-1ggaXF2JcS-00cfDD; Tue, 23 Apr 2019 17:12:01 +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:42 +0200 Message-Id: <20190423151143.464992-11-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:ct+gTL2Te6mZo5yuNszSYnw1+pp5ZfXQuZ9EXKldHEsqq/gQDUF RwiBsFKAZtrERLpwcCN9JPAE5Mpb5yasNrAp4XIo2WUxrhMgoh70oRuyoxG+DllT10WvAZc ZPB2fF1UP3wVWGANhDYqVs+aFjNAhCYjbP6pekVg7c79Xw7K56h1oJCcZRqGUbHYQxYy9YS Qq62y1VOtGhd29jIjvrvA== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:H3i9ivF7mOI=:u4Ehu3hzpdG1/seLGE78Ay b2rbIFIa0B7zO8tZeM+LMaJJcN+zqyunV6/wU/OzXMNUYqAgM7XpJAGF5nawM3LRzM48kNz41 HP7yagAgvUMILhTRPLCx2GdL/xd8LVX04QI5787Vyd5zgQkz60JrsG1pd6r+zAcSbGwnumUMU 6N7prosfyZaLPz2iHBjhgpe2/KpwTOXY0mdUSwu5qwipmKSmkYZ7QeMT0nVziKjg8fBjoSq+W lBTR5NFBHLzplItX7W717KJXnSuepDpEuksSce1VDvZt+GjhBsECZTiZi/t633f+EKHpAK58X EOcPe80foWP/hIC2tC0J2JMXxbM/2idLiNowxYzUS2lTnCSDYI9IqU/l8YsAqbwQV2xCOyR2y Fc/1ghGJzAEVDhBcypnGaUTBJ6CAsnzDeOch/ICC7fwacfl8xtd+6kimvOV34ueL/LHUIEc47 nKWSwbMTBcUbZuZiYe9jF205mpSBY94wyvRgyWj3WDUdXTdSzmi8Y3qntilsmheZulV4TJ44g DaSqFPzsMbSQmsLqMGf+yqRiiTOkyJ5jasEB5wWbVBFTNLsIdTY9kPidX3RPH7qBTQhh+Oy/O PEmWSQsqrtJKZ50UDvzddRpA/oSabm9mYC8y2d8mo0DnwqgW8D3K4Ji7MlGNT6BOSy+dOHd6L m7NMZxj1JBaaKGX6aNAVgrHnvBURUWutwDMl+bEoyqiKxcbyh++3GdtY+8nJSuoDx17pkZdPf 8z3ijWco7jaFIuRja6yQuKtUmCtxoI2vmeSidg== 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"