1 files changed, 6 insertions, 6 deletions

diff --git a/include/sound/core.h b/include/sound/core.h
index 5d184be0ff72..b056ea925ecf 100644
--- a/include/sound/core.h
+++ b/include/sound/core.h
@@ -25,8 +25,8 @@
 #include <linux/sched.h>                /* wake_up() */
 #include <linux/mutex.h>                /* struct mutex */
 #include <linux/rwsem.h>                /* struct rw_semaphore */
-#include <linux/workqueue.h>            /* struct workqueue_struct */
 #include <linux/pm.h>                   /* pm_message_t */
+#include <linux/device.h>
 
 /* forward declarations */
 #ifdef CONFIG_PCI
@@ -71,7 +71,6 @@ struct snd_device_ops {
         int (*dev_free)(struct snd_device *dev);
         int (*dev_register)(struct snd_device *dev);
         int (*dev_disconnect)(struct snd_device *dev);
-        int (*dev_unregister)(struct snd_device *dev);
 };
 
 struct snd_device {
@@ -131,8 +130,8 @@ struct snd_card {
                                                                 state */
         spinlock_t files_lock;          /* lock the files for this card */
         int shutdown;                   /* this card is going down */
+        int free_on_last_close;         /* free in context of file_release */
         wait_queue_head_t shutdown_sleep;
-        struct work_struct free_workq;  /* for free in workqueue */
         struct device *dev;
 
 #ifdef CONFIG_PM
@@ -188,8 +187,7 @@ struct snd_minor {
         int device;                     /* device number */
         const struct file_operations *f_ops;    /* file operations */
         void *private_data;             /* private data for f_ops->open */
-        char name[0];                   /* device name (keep at the end of
-                                                                structure) */
+        struct class_device *class_dev; /* class device for sysfs */
 };
 
 /* sound.c */
@@ -204,6 +202,8 @@ int snd_register_device(int type, struct snd_card *card, int dev,
                         const char *name);
 int snd_unregister_device(int type, struct snd_card *card, int dev);
 void *snd_lookup_minor_data(unsigned int minor, int type);
+int snd_add_device_sysfs_file(int type, struct snd_card *card, int dev,
+                              const struct class_device_attribute *attr);
 
 #ifdef CONFIG_SND_OSSEMUL
 int snd_register_oss_device(int type, struct snd_card *card, int dev,
@@ -246,7 +246,7 @@ struct snd_card *snd_card_new(int idx, const char *id,
                          struct module *module, int extra_size);
 int snd_card_disconnect(struct snd_card *card);
 int snd_card_free(struct snd_card *card);
-int snd_card_free_in_thread(struct snd_card *card);
+int snd_card_free_when_closed(struct snd_card *card);
 int snd_card_register(struct snd_card *card);
 int snd_card_info_init(void);
 int snd_card_info_done(void);