Commit 45065e10 authored by Alexander Viro's avatar Alexander Viro Committed by Linus Torvalds

[PATCH] capifs cleanup

	capifs switched to ramfs-style tree and cleaned up; it's the same
changes that had been done its prototype (devpts) + stuff needed to
deal with unload (devpts is non-modular and always internally mounted).
parent 18f26566
...@@ -278,7 +278,6 @@ static struct capincci *capincci_alloc(struct capidev *cdev, u32 ncci) ...@@ -278,7 +278,6 @@ static struct capincci *capincci_alloc(struct capidev *cdev, u32 ncci)
struct capincci *np, **pp; struct capincci *np, **pp;
#ifdef CONFIG_ISDN_CAPI_MIDDLEWARE #ifdef CONFIG_ISDN_CAPI_MIDDLEWARE
struct capiminor *mp = 0; struct capiminor *mp = 0;
kdev_t kdev;
#endif /* CONFIG_ISDN_CAPI_MIDDLEWARE */ #endif /* CONFIG_ISDN_CAPI_MIDDLEWARE */
np = kmalloc(sizeof(*np), GFP_ATOMIC); np = kmalloc(sizeof(*np), GFP_ATOMIC);
...@@ -297,8 +296,7 @@ static struct capincci *capincci_alloc(struct capidev *cdev, u32 ncci) ...@@ -297,8 +296,7 @@ static struct capincci *capincci_alloc(struct capidev *cdev, u32 ncci)
printk(KERN_DEBUG "set mp->nccip\n"); printk(KERN_DEBUG "set mp->nccip\n");
#endif #endif
#if defined(CONFIG_ISDN_CAPI_CAPIFS) || defined(CONFIG_ISDN_CAPI_CAPIFS_MODULE) #if defined(CONFIG_ISDN_CAPI_CAPIFS) || defined(CONFIG_ISDN_CAPI_CAPIFS_MODULE)
kdev = mk_kdev(capi_ttymajor, mp->minor); capifs_new_ncci(0, mp->minor, MKDEV(capi_ttymajor, mp->minor));
capifs_new_ncci(0, mp->minor, kdev);
#endif #endif
} }
#endif /* CONFIG_ISDN_CAPI_MIDDLEWARE */ #endif /* CONFIG_ISDN_CAPI_MIDDLEWARE */
......
This diff is collapsed.
...@@ -7,5 +7,5 @@ ...@@ -7,5 +7,5 @@
* *
*/ */
void capifs_new_ncci(char type, unsigned int num, kdev_t device); void capifs_new_ncci(char type, unsigned int num, dev_t device);
void capifs_free_ncci(char type, unsigned int num); void capifs_free_ncci(char type, unsigned int num);
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment