summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-09-07 15:50:18 +0200
committerTakashi Iwai <tiwai@suse.de>2009-09-07 15:50:18 +0200
commit82a783f4bcb878e6c4f02e24c7cd0687bdea7443 (patch)
tree217045a2d3c4315d39df4e6eef339f82dd42bdfb
parent9d32e03d01649d2dd837923470f3f323e3b88253 (diff)
downloadblackbird-op-linux-82a783f4bcb878e6c4f02e24c7cd0687bdea7443.tar.gz
blackbird-op-linux-82a783f4bcb878e6c4f02e24c7cd0687bdea7443.zip
ALSA: Remove struct snd_monitor_file from public sound/core.h
The struct snd_monitor_file is used locally only in sound/core/init.c, thus it should be moved there from the public sound/core.h. Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--include/sound/core.h9
-rw-r--r--sound/core/init.c8
2 files changed, 8 insertions, 9 deletions
diff --git a/include/sound/core.h b/include/sound/core.h
index 309cb9659a05..3bb07bc62255 100644
--- a/include/sound/core.h
+++ b/include/sound/core.h
@@ -93,15 +93,6 @@ struct snd_device {
#define snd_device(n) list_entry(n, struct snd_device, list)
-/* monitor files for graceful shutdown (hotplug) */
-
-struct snd_monitor_file {
- struct file *file;
- const struct file_operations *disconnected_f_op;
- struct list_head shutdown_list; /* still need to shutdown */
- struct list_head list; /* link of monitor files */
-};
-
/* main structure for soundcard */
struct snd_card {
diff --git a/sound/core/init.c b/sound/core/init.c
index d5d40d78c409..ec4a50ce5656 100644
--- a/sound/core/init.c
+++ b/sound/core/init.c
@@ -31,6 +31,14 @@
#include <sound/control.h>
#include <sound/info.h>
+/* monitor files for graceful shutdown (hotplug) */
+struct snd_monitor_file {
+ struct file *file;
+ const struct file_operations *disconnected_f_op;
+ struct list_head shutdown_list; /* still need to shutdown */
+ struct list_head list; /* link of monitor files */
+};
+
static DEFINE_SPINLOCK(shutdown_lock);
static LIST_HEAD(shutdown_files);
OpenPOWER on IntegriCloud