snd_info_register: switch to proc_create_data/proc_mkdir_mode

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

1 files changed, 14 insertions, 8 deletions

diff --git a/sound/core/info.c b/sound/core/info.c
index 5bb97e7d325a..a4e2de6874df 100644
--- a/sound/core/info.c
+++ b/sound/core/info.c
@@ -959,15 +959,21 @@ int snd_info_register(struct snd_info_entry * entry)
                 return -ENXIO;
         root = entry->parent == NULL ? snd_proc_root : entry->parent->p;
         mutex_lock(&info_mutex);
-        p = create_proc_entry(entry->name, entry->mode, root);
-        if (!p) {
-                mutex_unlock(&info_mutex);
-                return -ENOMEM;
+        if (S_ISDIR(entry->mode)) {
+                p = proc_mkdir_mode(entry->name, entry->mode, root);
+                if (!p) {
+                        mutex_unlock(&info_mutex);
+                        return -ENOMEM;
+                }
+        } else {
+                p = proc_create_data(entry->name, entry->mode, root,
+                                        &snd_info_entry_operations, entry);
+                if (!p) {
+                        mutex_unlock(&info_mutex);
+                        return -ENOMEM;
+                }
+                p->size = entry->size;
         }
-        if (!S_ISDIR(entry->mode))
-                p->proc_fops = &snd_info_entry_operations;
-        p->size = entry->size;
-        p->data = entry;
         entry->p = p;
         if (entry->parent)
                 list_add_tail(&entry->list, &entry->parent->children);