Skip to contentSkip to conversation

isdn: remove deprecated ISDN_CAPI_CAPIFS

PATCH In review Amerigo Wang 3 participants 5 messages Apr 6, 2011 – Apr 7, 2011

Subsystems (3)
Networking Network drivers Documentation
lore
Share & tools
lore

Amerigo Wang

author
#0 lore raw

PATCH 1/1 isdn: remove deprecated ISDN_CAPI_CAPIFS

Cc Jan Kiszka <[email protected]>
Cc Karsten Keil <[email protected]>
Signed-off-by WANG Cong <[email protected]>

--

 Documentation/feature-removal-schedule.txt |   10 --
 drivers/isdn/capi/Kconfig                  |   15 --
 drivers/isdn/capi/Makefile                 |    1 -
 drivers/isdn/capi/capi.c                   |    4 +-
 drivers/isdn/capi/capifs.c                 |  239 ----------------------------
 drivers/isdn/capi/capifs.h                 |   28 ----
 6 files changed, 1 insertions(+), 296 deletions(-)
Documentation/feature-removal-schedule.txt +0 -10
index 274b32d..e38ccae 100644
@@ -425,16 +425,6 @@ Who: 	anybody or Florian Mickler <[email protected]>
 
 ----------------------------
 
-What:	capifs
-When:	February 2011
-Files:	drivers/isdn/capi/capifs.*
-Why:	udev fully replaces this special file system that only contains CAPI
-	NCCI TTY device nodes. User space (pppdcapiplugin) works without
-	noticing the difference.
-Who:	Jan Kiszka <[email protected]>
-
-----------------------------
-
 What:	KVM paravirt mmu host support
 When:	January 2011
 Why:	The paravirt mmu host support is slower than non-paravirt mmu, both
drivers/isdn/capi/Kconfig +0 -15
index a168e8a..15c3ffd 100644
@@ -33,21 +33,6 @@ config ISDN_CAPI_CAPI20
 	  standardized libcapi20 to access this functionality.  You should say
 	  Y/M here.
 
-config ISDN_CAPI_CAPIFS_BOOL
-	bool "CAPI2.0 filesystem support (DEPRECATED)"
-	depends on ISDN_CAPI_MIDDLEWARE && ISDN_CAPI_CAPI20
-	help
-	  This option provides a special file system, similar to /dev/pts with
-	  device nodes for the special ttys established by using the
-	  middleware extension above.
-	  You no longer need this, udev fully replaces it. This feature is
-	  scheduled for removal.
-
-config ISDN_CAPI_CAPIFS
-	tristate
-	depends on ISDN_CAPI_CAPIFS_BOOL
-	default ISDN_CAPI_CAPI20
-
 config ISDN_CAPI_CAPIDRV
 	tristate "CAPI2.0 capidrv interface support"
 	depends on ISDN_I4L
drivers/isdn/capi/Makefile +0 -1
index 57123e3..4d5b4b7 100644
@@ -7,7 +7,6 @@
 obj-$(CONFIG_ISDN_CAPI)			+= kernelcapi.o
 obj-$(CONFIG_ISDN_CAPI_CAPI20)		+= capi.o 
 obj-$(CONFIG_ISDN_CAPI_CAPIDRV)		+= capidrv.o
-obj-$(CONFIG_ISDN_CAPI_CAPIFS)		+= capifs.o
 
 # Multipart objects.
drivers/isdn/capi/capi.c +1 -3
index 0d70883..b16e845 100644
@@ -1514,9 +1514,7 @@ static int __init capi_init(void)
 
 	proc_init();
 
-#if defined(CONFIG_ISDN_CAPI_CAPIFS) || defined(CONFIG_ISDN_CAPI_CAPIFS_MODULE)
-        compileinfo = " (middleware+capifs)";
-#elif defined(CONFIG_ISDN_CAPI_MIDDLEWARE)
+#if defined(CONFIG_ISDN_CAPI_MIDDLEWARE)
         compileinfo = " (no capifs)";
 #else
         compileinfo = " (no middleware)";
drivers/isdn/capi/capifs.c deleted +0 -239

239 lines not on this page · raw message

drivers/isdn/capi/capifs.h deleted +0 -28
deleted file mode 100644
index e193d11..0000000
@@ -1,28 +0,0 @@
-/* $Id: capifs.h,v 1.1.2.2 2004/01/16 21:09:26 keil Exp $
- * 
- * Copyright 2000 by Carsten Paeth <[email protected]>
- *
- * This software may be used and distributed according to the terms
- * of the GNU General Public License, incorporated herein by reference.
- *
- */
-
-#include <linux/dcache.h>
-
-#if defined(CONFIG_ISDN_CAPI_CAPIFS) || defined(CONFIG_ISDN_CAPI_CAPIFS_MODULE)
-
-struct dentry *capifs_new_ncci(unsigned int num, dev_t device);
-void capifs_free_ncci(struct dentry *dentry);
-
-#else
-
-static inline struct dentry *capifs_new_ncci(unsigned int num, dev_t device)
-{
-	return NULL;
-}
-
-static inline void capifs_free_ncci(struct dentry *dentry)
-{
-}
-
-#endif
#3 lore raw

PATCH 1/1 capi: Perform scheduled capifs removal

In reply to Amerigo Wang

udev fully replaces this special file system that only contains CAPI NCCI TTY device nodes. User space (pppdcapiplugin) works without noticing the difference.

Signed-off-by Jan Kiszka <[email protected]>

---

I had this version queued locally for quite a while but then forgot to post it... Thanks for bringing this topic up, Amerigo, but your patch was missing a few remaining fragments.

 Documentation/feature-removal-schedule.txt |   10 --
 drivers/isdn/capi/Kconfig                  |   15 --
 drivers/isdn/capi/Makefile                 |    1 -
 drivers/isdn/capi/capi.c                   |   24 +---
 drivers/isdn/capi/capifs.c                 |  239 ----------------------------
 drivers/isdn/capi/capifs.h                 |   28 ----
 6 files changed, 4 insertions(+), 313 deletions(-)
 delete mode 100644 drivers/isdn/capi/capifs.c
 delete mode 100644 drivers/isdn/capi/capifs.h
Documentation/feature-removal-schedule.txt +0 -10
index 274b32d..e38ccae 100644
@@ -425,16 +425,6 @@ Who: 	anybody or Florian Mickler <[email protected]>
 
 ----------------------------
 
-What:	capifs
-When:	February 2011
-Files:	drivers/isdn/capi/capifs.*
-Why:	udev fully replaces this special file system that only contains CAPI
-	NCCI TTY device nodes. User space (pppdcapiplugin) works without
-	noticing the difference.
-Who:	Jan Kiszka <[email protected]>
-
-----------------------------
-
 What:	KVM paravirt mmu host support
 When:	January 2011
 Why:	The paravirt mmu host support is slower than non-paravirt mmu, both
drivers/isdn/capi/Kconfig +0 -15
index a168e8a..15c3ffd 100644
@@ -33,21 +33,6 @@ config ISDN_CAPI_CAPI20
 	  standardized libcapi20 to access this functionality.  You should say
 	  Y/M here.
 
-config ISDN_CAPI_CAPIFS_BOOL
-	bool "CAPI2.0 filesystem support (DEPRECATED)"
-	depends on ISDN_CAPI_MIDDLEWARE && ISDN_CAPI_CAPI20
-	help
-	  This option provides a special file system, similar to /dev/pts with
-	  device nodes for the special ttys established by using the
-	  middleware extension above.
-	  You no longer need this, udev fully replaces it. This feature is
-	  scheduled for removal.
-
-config ISDN_CAPI_CAPIFS
-	tristate
-	depends on ISDN_CAPI_CAPIFS_BOOL
-	default ISDN_CAPI_CAPI20
-
 config ISDN_CAPI_CAPIDRV
 	tristate "CAPI2.0 capidrv interface support"
 	depends on ISDN_I4L
drivers/isdn/capi/Makefile +0 -1
index 57123e3..4d5b4b7 100644
@@ -7,7 +7,6 @@
 obj-$(CONFIG_ISDN_CAPI)			+= kernelcapi.o
 obj-$(CONFIG_ISDN_CAPI_CAPI20)		+= capi.o 
 obj-$(CONFIG_ISDN_CAPI_CAPIDRV)		+= capidrv.o
-obj-$(CONFIG_ISDN_CAPI_CAPIFS)		+= capifs.o
 
 # Multipart objects.
drivers/isdn/capi/capi.c +4 -20
index 0d70883..bea1009 100644
@@ -38,8 +38,6 @@
 #include <linux/isdn/capiutil.h>
 #include <linux/isdn/capicmd.h>
 
-#include "capifs.h"
-
 MODULE_DESCRIPTION("CAPI4Linux: Userspace /dev/capi20 interface");
 MODULE_AUTHOR("Carsten Paeth");
 MODULE_LICENSE("GPL");

@@ -85,7 +83,6 @@ struct capiminor {
 	struct kref kref;
 
 	unsigned int      minor;
-	struct dentry *capifs_dentry;
 
 	struct capi20_appl	*ap;
 	u32			ncci;

@@ -300,17 +297,8 @@ static void capiminor_free(struct capiminor *mp)
 
 static void capincci_alloc_minor(struct capidev *cdev, struct capincci *np)
 {
-	struct capiminor *mp;
-	dev_t device;
-
-	if (!(cdev->userflags & CAPIFLAG_HIGHJACKING))
-		return;
-
-	mp = np->minorp = capiminor_alloc(&cdev->ap, np->ncci);
-	if (mp) {
-		device = MKDEV(capinc_tty_driver->major, mp->minor);
-		mp->capifs_dentry = capifs_new_ncci(mp->minor, device);
-	}
+	if (cdev->userflags & CAPIFLAG_HIGHJACKING)
+		np->minorp = capiminor_alloc(&cdev->ap, np->ncci);
 }
 
 static void capincci_free_minor(struct capincci *np)

@@ -319,8 +307,6 @@ static void capincci_free_minor(struct capincci *np)
 	struct tty_struct *tty;
 
 	if (mp) {
-		capifs_free_ncci(mp->capifs_dentry);
-
 		tty = tty_port_tty_get(&mp->port);
 		if (tty) {
 			tty_vhangup(tty);

@@ -1514,10 +1500,8 @@ static int __init capi_init(void)
 
 	proc_init();
 
-#if defined(CONFIG_ISDN_CAPI_CAPIFS) || defined(CONFIG_ISDN_CAPI_CAPIFS_MODULE)
-        compileinfo = " (middleware+capifs)";
-#elif defined(CONFIG_ISDN_CAPI_MIDDLEWARE)
-        compileinfo = " (no capifs)";
+#ifdef CONFIG_ISDN_CAPI_MIDDLEWARE
+        compileinfo = " (middleware)";
 #else
         compileinfo = " (no middleware)";
 #endif
drivers/isdn/capi/capifs.c deleted +0 -239

239 lines not on this page · raw message

drivers/isdn/capi/capifs.h deleted +0 -28
deleted file mode 100644
index e193d11..0000000
@@ -1,28 +0,0 @@
-/* $Id: capifs.h,v 1.1.2.2 2004/01/16 21:09:26 keil Exp $
- * 
- * Copyright 2000 by Carsten Paeth <[email protected]>
- *
- * This software may be used and distributed according to the terms
- * of the GNU General Public License, incorporated herein by reference.
- *
- */
-
-#include <linux/dcache.h>
-
-#if defined(CONFIG_ISDN_CAPI_CAPIFS) || defined(CONFIG_ISDN_CAPI_CAPIFS_MODULE)
-
-struct dentry *capifs_new_ncci(unsigned int num, dev_t device);
-void capifs_free_ncci(struct dentry *dentry);
-
-#else
-
-static inline struct dentry *capifs_new_ncci(unsigned int num, dev_t device)
-{
-	return NULL;
-}
-
-static inline void capifs_free_ncci(struct dentry *dentry)
-{
-}
-
-#endif
Signature · 1 line
1.7.1
maintainer Applied
#4 lore raw

Re: [PATCH] capi: Perform scheduled capifs removal

From: Jan Kiszka <[email protected]>
Date: Wed, 06 Apr 2011 22:58:37 +0200

Quoted 5 lines

udev fully replaces this special file system that only contains CAPI NCCI TTY device nodes. User space (pppdcapiplugin) works without noticing the difference.

Signed-off-by Jan Kiszka <[email protected]>

Applied, thanks Jan.