Merge git://oss.sgi.com:8090/oss/git/xfs-2.6

[linux-2.6] / sound / core / init.c

diff --git a/sound/core/init.c b/sound/core/init.c
index 58e17d385f8d9cc65a58cdfa84a13a64f6d63b0d..ad68761abba1a86eb9dd9fa16d0c495ecb428d84 100644 (file)
--- a/sound/core/init.c
+++ b/sound/core/init.c
@@ -46,12 +46,39 @@ DEFINE_RWLOCK(snd_card_rwlock);
 int (*snd_mixer_oss_notify_callback)(struct snd_card *card, int free_flag);
 #endif
 
+#ifdef CONFIG_PROC_FS
 static void snd_card_id_read(struct snd_info_entry *entry,
                             struct snd_info_buffer *buffer)
 {
        snd_iprintf(buffer, "%s\n", entry->card->id);
 }
 
+static inline int init_info_for_card(struct snd_card *card)
+{
+       int err;
+       struct snd_info_entry *entry;
+
+       if ((err = snd_info_card_register(card)) < 0) {
+               snd_printd("unable to create card info\n");
+               return err;
+       }
+       if ((entry = snd_info_create_card_entry(card, "id", card->proc_root)) == NULL) {
+               snd_printd("unable to create card entry\n");
+               return err;
+       }
+       entry->c.text.read_size = PAGE_SIZE;
+       entry->c.text.read = snd_card_id_read;
+       if (snd_info_register(entry) < 0) {
+               snd_info_free_entry(entry);
+               entry = NULL;
+       }
+       card->proc_id = entry;
+       return 0;
+}
+#else /* !CONFIG_PROC_FS */
+#define init_info_for_card(card)
+#endif
+
 static void snd_card_free_thread(void * __card);
 
 /**
@@ -118,7 +145,7 @@ struct snd_card *snd_card_new(int idx, const char *xid,
        init_waitqueue_head(&card->shutdown_sleep);
        INIT_WORK(&card->free_workq, snd_card_free_thread, card);
 #ifdef CONFIG_PM
-       init_MUTEX(&card->power_lock);
+       mutex_init(&card->power_lock);
        init_waitqueue_head(&card->power_sleep);
 #endif
        /* the control interface cannot be accessed from the user space until */
@@ -142,11 +169,44 @@ struct snd_card *snd_card_new(int idx, const char *xid,
        return NULL;
 }
 
+static loff_t snd_disconnect_llseek(struct file *file, loff_t offset, int orig)
+{
+       return -ENODEV;
+}
+
+static ssize_t snd_disconnect_read(struct file *file, char __user *buf,
+                                  size_t count, loff_t *offset)
+{
+       return -ENODEV;
+}
+
+static ssize_t snd_disconnect_write(struct file *file, const char __user *buf,
+                                   size_t count, loff_t *offset)
+{
+       return -ENODEV;
+}
+
 static unsigned int snd_disconnect_poll(struct file * file, poll_table * wait)
 {
        return POLLERR | POLLNVAL;
 }
 
+static long snd_disconnect_ioctl(struct file *file,
+                                unsigned int cmd, unsigned long arg)
+{
+       return -ENODEV;
+}
+
+static int snd_disconnect_mmap(struct file *file, struct vm_area_struct *vma)
+{
+       return -ENODEV;
+}
+
+static int snd_disconnect_fasync(int fd, struct file *file, int on)
+{
+       return -ENODEV;
+}
+
 /**
  *  snd_card_disconnect - disconnect all APIs from the file-operations (user space)
  *  @card: soundcard structure
@@ -197,7 +257,16 @@ int snd_card_disconnect(struct snd_card *card)
                memset(f_ops, 0, sizeof(*f_ops));
                f_ops->owner = file->f_op->owner;
                f_ops->release = file->f_op->release;
+               f_ops->llseek = snd_disconnect_llseek;
+               f_ops->read = snd_disconnect_read;
+               f_ops->write = snd_disconnect_write;
                f_ops->poll = snd_disconnect_poll;
+               f_ops->unlocked_ioctl = snd_disconnect_ioctl;
+#ifdef CONFIG_COMPAT
+               f_ops->compat_ioctl = snd_disconnect_ioctl;
+#endif
+               f_ops->mmap = snd_disconnect_mmap;
+               f_ops->fasync = snd_disconnect_fasync;
 
                s_f_ops->next = card->s_f_ops;
                card->s_f_ops = s_f_ops;
@@ -273,8 +342,7 @@ int snd_card_free(struct snd_card *card)
        }
        if (card->private_free)
                card->private_free(card);
-       if (card->proc_id)
-               snd_info_unregister(card->proc_id);
+       snd_info_unregister(card->proc_id);
        if (snd_info_card_free(card) < 0) {
                snd_printk(KERN_WARNING "unable to free card info\n");
                /* Not fatal error */
@@ -414,7 +482,6 @@ static void choose_default_id(struct snd_card *card)
 int snd_card_register(struct snd_card *card)
 {
        int err;
-       struct snd_info_entry *entry;
 
        snd_assert(card != NULL, return -EINVAL);
        if ((err = snd_device_register_all(card)) < 0)
@@ -429,22 +496,7 @@ int snd_card_register(struct snd_card *card)
                choose_default_id(card);
        snd_cards[card->number] = card;
        write_unlock(&snd_card_rwlock);
-       if ((err = snd_info_card_register(card)) < 0) {
-               snd_printd("unable to create card info\n");
-               goto __skip_info;
-       }
-       if ((entry = snd_info_create_card_entry(card, "id", card->proc_root)) == NULL) {
-               snd_printd("unable to create card entry\n");
-               goto __skip_info;
-       }
-       entry->c.text.read_size = PAGE_SIZE;
-       entry->c.text.read = snd_card_id_read;
-       if (snd_info_register(entry) < 0) {
-               snd_info_free_entry(entry);
-               entry = NULL;
-       }
-       card->proc_id = entry;
-      __skip_info:
+       init_info_for_card(card);
 #if defined(CONFIG_SND_MIXER_OSS) || defined(CONFIG_SND_MIXER_OSS_MODULE)
        if (snd_mixer_oss_notify_callback)
                snd_mixer_oss_notify_callback(card, SND_MIXER_OSS_NOTIFY_REGISTER);
@@ -452,6 +504,7 @@ int snd_card_register(struct snd_card *card)
        return 0;
 }
 
+#ifdef CONFIG_PROC_FS
 static struct snd_info_entry *snd_card_info_entry = NULL;
 
 static void snd_card_info_read(struct snd_info_entry *entry,
@@ -478,7 +531,7 @@ static void snd_card_info_read(struct snd_info_entry *entry,
                snd_iprintf(buffer, "--- no soundcards ---\n");
 }
 
-#if defined(CONFIG_SND_OSSEMUL) && defined(CONFIG_PROC_FS)
+#ifdef CONFIG_SND_OSSEMUL
 
 void snd_card_info_read_oss(struct snd_info_buffer *buffer)
 {
@@ -550,15 +603,15 @@ int __init snd_card_info_init(void)
 
 int __exit snd_card_info_done(void)
 {
-       if (snd_card_info_entry)
-               snd_info_unregister(snd_card_info_entry);
+       snd_info_unregister(snd_card_info_entry);
 #ifdef MODULE
-       if (snd_card_module_info_entry)
-               snd_info_unregister(snd_card_module_info_entry);
+       snd_info_unregister(snd_card_module_info_entry);
 #endif
        return 0;
 }
 
+#endif /* CONFIG_PROC_FS */
+
 /**
  *  snd_component_add - add a component string
  *  @card: soundcard structure