The patch titled
Subject: sound: convert snd_info_register() to use proc_create_data()
has been removed from the -mm tree. Its filename was
sound-convert-snd_info_register-to-use-proc_create_data.patch
This patch was dropped because other changes were merged, which wrecked this patch
------------------------------------------------------
From: Nathan Zimmer <nzimmer@xxxxxxx>
Subject: sound: convert snd_info_register() to use proc_create_data()
Convert snd_info_register to use proc_create_data instead of
create_proc_entry. This corrects a sparse warning introduced by "procfs:
Improve Scaling in proc" It is also a bit cleaner to let proc_create_data
set the ->data and ->proc_fops.
Signed-off-by: Nathan Zimmer <nzimmer@xxxxxxx>
Cc: Jaroslav Kysela <perex@xxxxxxxx>
Cc: Takashi Iwai <tiwai@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
sound/core/info.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff -puN sound/core/info.c~sound-convert-snd_info_register-to-use-proc_create_data sound/core/info.c
--- a/sound/core/info.c~sound-convert-snd_info_register-to-use-proc_create_data
+++ a/sound/core/info.c
@@ -949,20 +949,20 @@ EXPORT_SYMBOL(snd_info_free_entry);
int snd_info_register(struct snd_info_entry * entry)
{
struct proc_dir_entry *root, *p = NULL;
+ const struct file_operations *fops = NULL;
if (snd_BUG_ON(!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 (!S_ISDIR(entry->mode))
+ fops = &snd_info_entry_operations;
+ p = proc_create_data(entry->name, entry->mode, root, fops, entry);
if (!p) {
mutex_unlock(&info_mutex);
return -ENOMEM;
}
- 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);
_
Patches currently in -mm which might be from nzimmer@xxxxxxx are
linux-next.patch
timer_list-split-timer_list_show_tickdevices.patch
timer_list-convert-timer-list-to-be-a-proper-seq_file.patch
timer_list-convert-timer-list-to-be-a-proper-seq_file-v5.patch
procfs-improve-scaling-in-proc.patch
procfs-improve-scaling-in-proc-v5.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
