diff options
author | Al Viro <viro@ftp.linux.org.uk> | 2005-09-28 17:32:57 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-29 11:46:26 -0400 |
commit | 666002218d59db271e5c1ede1d80227170c51987 (patch) | |
tree | 1fadcb278c817ce56a653e5c3c58637f5056feec /drivers/isdn/hardware | |
parent | ecba97d4aacf4e80c56eb73e39af0369cb8539a4 (diff) |
[PATCH] proc_mkdir() should be used to create procfs directories
A bunch of create_proc_dir_entry() calls creating directories had crept
in since the last sweep; converted to proc_mkdir().
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/isdn/hardware')
-rw-r--r-- | drivers/isdn/hardware/eicon/diva_didd.c | 6 | ||||
-rw-r--r-- | drivers/isdn/hardware/eicon/divasproc.c | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/drivers/isdn/hardware/eicon/diva_didd.c b/drivers/isdn/hardware/eicon/diva_didd.c index 7fdf8ae5be52..27204f4b111a 100644 --- a/drivers/isdn/hardware/eicon/diva_didd.c +++ b/drivers/isdn/hardware/eicon/diva_didd.c | |||
@@ -30,8 +30,6 @@ static char *DRIVERNAME = | |||
30 | static char *DRIVERLNAME = "divadidd"; | 30 | static char *DRIVERLNAME = "divadidd"; |
31 | char *DRIVERRELEASE_DIDD = "2.0"; | 31 | char *DRIVERRELEASE_DIDD = "2.0"; |
32 | 32 | ||
33 | static char *main_proc_dir = "eicon"; | ||
34 | |||
35 | MODULE_DESCRIPTION("DIDD table driver for diva drivers"); | 33 | MODULE_DESCRIPTION("DIDD table driver for diva drivers"); |
36 | MODULE_AUTHOR("Cytronics & Melware, Eicon Networks"); | 34 | MODULE_AUTHOR("Cytronics & Melware, Eicon Networks"); |
37 | MODULE_SUPPORTED_DEVICE("Eicon diva drivers"); | 35 | MODULE_SUPPORTED_DEVICE("Eicon diva drivers"); |
@@ -89,7 +87,7 @@ proc_read(char *page, char **start, off_t off, int count, int *eof, | |||
89 | 87 | ||
90 | static int DIVA_INIT_FUNCTION create_proc(void) | 88 | static int DIVA_INIT_FUNCTION create_proc(void) |
91 | { | 89 | { |
92 | proc_net_eicon = create_proc_entry(main_proc_dir, S_IFDIR, proc_net); | 90 | proc_net_eicon = proc_mkdir("net/eicon", NULL); |
93 | 91 | ||
94 | if (proc_net_eicon) { | 92 | if (proc_net_eicon) { |
95 | if ((proc_didd = | 93 | if ((proc_didd = |
@@ -105,7 +103,7 @@ static int DIVA_INIT_FUNCTION create_proc(void) | |||
105 | static void DIVA_EXIT_FUNCTION remove_proc(void) | 103 | static void DIVA_EXIT_FUNCTION remove_proc(void) |
106 | { | 104 | { |
107 | remove_proc_entry(DRIVERLNAME, proc_net_eicon); | 105 | remove_proc_entry(DRIVERLNAME, proc_net_eicon); |
108 | remove_proc_entry(main_proc_dir, proc_net); | 106 | remove_proc_entry("net/eicon", NULL); |
109 | } | 107 | } |
110 | 108 | ||
111 | static int DIVA_INIT_FUNCTION divadidd_init(void) | 109 | static int DIVA_INIT_FUNCTION divadidd_init(void) |
diff --git a/drivers/isdn/hardware/eicon/divasproc.c b/drivers/isdn/hardware/eicon/divasproc.c index b6435589d459..c12efa6f8429 100644 --- a/drivers/isdn/hardware/eicon/divasproc.c +++ b/drivers/isdn/hardware/eicon/divasproc.c | |||
@@ -381,7 +381,7 @@ int create_adapter_proc(diva_os_xdi_adapter_t * a) | |||
381 | char tmp[16]; | 381 | char tmp[16]; |
382 | 382 | ||
383 | sprintf(tmp, "%s%d", adapter_dir_name, a->controller); | 383 | sprintf(tmp, "%s%d", adapter_dir_name, a->controller); |
384 | if (!(de = create_proc_entry(tmp, S_IFDIR, proc_net_eicon))) | 384 | if (!(de = proc_mkdir(tmp, proc_net_eicon))) |
385 | return (0); | 385 | return (0); |
386 | a->proc_adapter_dir = (void *) de; | 386 | a->proc_adapter_dir = (void *) de; |
387 | 387 | ||