diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-09-07 09:50:18 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-09-07 09:50:18 -0400 |
| commit | 82a783f4bcb878e6c4f02e24c7cd0687bdea7443 (patch) | |
| tree | 217045a2d3c4315d39df4e6eef339f82dd42bdfb | |
| parent | 9d32e03d01649d2dd837923470f3f323e3b88253 (diff) | |
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.h | 9 | ||||
| -rw-r--r-- | sound/core/init.c | 8 |
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 { | |||
| 93 | 93 | ||
| 94 | #define snd_device(n) list_entry(n, struct snd_device, list) | 94 | #define snd_device(n) list_entry(n, struct snd_device, list) |
| 95 | 95 | ||
| 96 | /* monitor files for graceful shutdown (hotplug) */ | ||
| 97 | |||
| 98 | struct snd_monitor_file { | ||
| 99 | struct file *file; | ||
| 100 | const struct file_operations *disconnected_f_op; | ||
| 101 | struct list_head shutdown_list; /* still need to shutdown */ | ||
| 102 | struct list_head list; /* link of monitor files */ | ||
| 103 | }; | ||
| 104 | |||
| 105 | /* main structure for soundcard */ | 96 | /* main structure for soundcard */ |
| 106 | 97 | ||
| 107 | struct snd_card { | 98 | 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 @@ | |||
| 31 | #include <sound/control.h> | 31 | #include <sound/control.h> |
| 32 | #include <sound/info.h> | 32 | #include <sound/info.h> |
| 33 | 33 | ||
| 34 | /* monitor files for graceful shutdown (hotplug) */ | ||
| 35 | struct snd_monitor_file { | ||
| 36 | struct file *file; | ||
| 37 | const struct file_operations *disconnected_f_op; | ||
| 38 | struct list_head shutdown_list; /* still need to shutdown */ | ||
| 39 | struct list_head list; /* link of monitor files */ | ||
| 40 | }; | ||
| 41 | |||
| 34 | static DEFINE_SPINLOCK(shutdown_lock); | 42 | static DEFINE_SPINLOCK(shutdown_lock); |
| 35 | static LIST_HEAD(shutdown_files); | 43 | static LIST_HEAD(shutdown_files); |
| 36 | 44 | ||
