Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

[linux.git] / sound / core / info.c

diff --git a/sound/core/info.c b/sound/core/info.c
index 6801d8160866885eeab1dcdbfba396d9aca5ed80..ca87ae4c30ba23e6ff71f3de523d892fd4efc844 100644 (file)
--- a/sound/core/info.c
+++ b/sound/core/info.c
@@ -282,17 +282,16 @@ static int snd_info_entry_release(struct inode *inode, struct file *file)
        return 0;
 }
 
-static const struct file_operations snd_info_entry_operations =
-{
-       .owner =                THIS_MODULE,
-       .llseek =               snd_info_entry_llseek,
-       .read =                 snd_info_entry_read,
-       .write =                snd_info_entry_write,
-       .poll =                 snd_info_entry_poll,
-       .unlocked_ioctl =       snd_info_entry_ioctl,
-       .mmap =                 snd_info_entry_mmap,
-       .open =                 snd_info_entry_open,
-       .release =              snd_info_entry_release,
+static const struct proc_ops snd_info_entry_operations =
+{
+       .proc_lseek     = snd_info_entry_llseek,
+       .proc_read      = snd_info_entry_read,
+       .proc_write     = snd_info_entry_write,
+       .proc_poll      = snd_info_entry_poll,
+       .proc_ioctl     = snd_info_entry_ioctl,
+       .proc_mmap      = snd_info_entry_mmap,
+       .proc_open      = snd_info_entry_open,
+       .proc_release   = snd_info_entry_release,
 };
 
 /*
@@ -421,14 +420,13 @@ static int snd_info_text_entry_release(struct inode *inode, struct file *file)
        return 0;
 }
 
-static const struct file_operations snd_info_text_entry_ops =
+static const struct proc_ops snd_info_text_entry_ops =
 {
-       .owner =                THIS_MODULE,
-       .open =                 snd_info_text_entry_open,
-       .release =              snd_info_text_entry_release,
-       .write =                snd_info_text_entry_write,
-       .llseek =               seq_lseek,
-       .read =                 seq_read,
+       .proc_open      = snd_info_text_entry_open,
+       .proc_release   = snd_info_text_entry_release,
+       .proc_write     = snd_info_text_entry_write,
+       .proc_lseek     = seq_lseek,
+       .proc_read      = seq_read,
 };
 
 static struct snd_info_entry *create_subdir(struct module *mod,
@@ -810,7 +808,7 @@ static int __snd_info_register(struct snd_info_entry *entry)
                        return -ENOMEM;
                }
        } else {
-               const struct file_operations *ops;
+               const struct proc_ops *ops;
                if (entry->content == SNDRV_INFO_CONTENT_DATA)
                        ops = &snd_info_entry_operations;
                else