From b8553086288629b4efb77e97f5582e08bc50ad65 Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Sat, 8 Jul 2000 00:53:00 +0000 Subject: Merge with 2.4.0-test3-pre4. --- drivers/isdn/avmb1/capi.c | 10 +++++----- drivers/isdn/isdn_common.c | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'drivers/isdn') diff --git a/drivers/isdn/avmb1/capi.c b/drivers/isdn/avmb1/capi.c index 610c20b6d..009010896 100644 --- a/drivers/isdn/avmb1/capi.c +++ b/drivers/isdn/avmb1/capi.c @@ -2089,7 +2089,7 @@ int capi_init(void) #ifdef CONFIG_ISDN_CAPI_MIDDLEWARE devfs_unregister_chrdev(capi_rawmajor, "capi/r%d"); #endif /* CONFIG_ISDN_CAPI_MIDDLEWARE */ - devfs_unregister(devfs_find_handle(NULL, "capi20", 0, + devfs_unregister(devfs_find_handle(NULL, "capi20", capi_major, 0, DEVFS_SPECIAL_CHR, 0)); return -EIO; @@ -2112,13 +2112,13 @@ int capi_init(void) for (j = 0; j < CAPINC_NR_PORTS; j++) { char devname[32]; sprintf(devname, "capi/r%u", j); - devfs_unregister(devfs_find_handle(NULL, devname, 0, capi_rawmajor, j, DEVFS_SPECIAL_CHR, 0)); + devfs_unregister(devfs_find_handle(NULL, devname, capi_rawmajor, j, DEVFS_SPECIAL_CHR, 0)); } capinc_tty_exit(); #endif /* CONFIG_ISDN_CAPI_MIDDLEWARE */ (void) detach_capi_interface(&cuser); devfs_unregister_chrdev(capi_major, "capi20"); - devfs_unregister(devfs_find_handle(NULL, "capi20", 0, + devfs_unregister(devfs_find_handle(NULL, "capi20", capi_major, 0, DEVFS_SPECIAL_CHR, 0)); MOD_DEC_USE_COUNT; @@ -2144,7 +2144,7 @@ void cleanup_module(void) (void)proc_exit(); devfs_unregister_chrdev(capi_major, "capi20"); - devfs_unregister(devfs_find_handle(NULL, "isdn/capi20", 0, capi_major, 0, DEVFS_SPECIAL_CHR, 0)); + devfs_unregister(devfs_find_handle(NULL, "isdn/capi20", capi_major, 0, DEVFS_SPECIAL_CHR, 0)); #ifdef CONFIG_ISDN_CAPI_MIDDLEWARE capinc_tty_exit(); @@ -2152,7 +2152,7 @@ void cleanup_module(void) for (j = 0; j < CAPINC_NR_PORTS; j++) { char devname[32]; sprintf(devname, "capi/r%u", j); - devfs_unregister(devfs_find_handle(NULL, devname, 0, capi_rawmajor, j, DEVFS_SPECIAL_CHR, 0)); + devfs_unregister(devfs_find_handle(NULL, devname, capi_rawmajor, j, DEVFS_SPECIAL_CHR, 0)); } #endif (void) detach_capi_interface(&cuser); diff --git a/drivers/isdn/isdn_common.c b/drivers/isdn/isdn_common.c index fa5a3d844..f6c326301 100644 --- a/drivers/isdn/isdn_common.c +++ b/drivers/isdn/isdn_common.c @@ -2603,7 +2603,7 @@ static void isdn_init_devfs(void) int i; # endif - devfs_handle = devfs_mk_dir (NULL, "isdn", 4, NULL); + devfs_handle = devfs_mk_dir (NULL, "isdn", NULL); # ifdef CONFIG_ISDN_PPP for (i = 0; i < ISDN_MAX_CHANNELS; i++) { char buf[8]; -- cgit v1.2.3