diff options
author | Takashi Iwai <tiwai@suse.de> | 2015-01-29 11:55:52 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2015-02-02 08:42:43 -0500 |
commit | aee5012fbb77dad6179c44d83d531ad62dd8098a (patch) | |
tree | 82c169a7d567a52f0f48a5bcdeb027574bebfc6f /include/sound | |
parent | ef46c7af93f98d07cd0ed891f93a26d135785526 (diff) |
ALSA: rawmidi: Embed struct device
Like previous patches, this changes the device management for rawmidi,
embedding the struct device into struct snd_rawmidi. The required
change is more or less same as hwdep device.
The currently unused dev field is reused as the new embedded struct
field now.
Reviewed-by: Jaroslav Kysela <perex@perex.cz>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'include/sound')
-rw-r--r-- | include/sound/rawmidi.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/sound/rawmidi.h b/include/sound/rawmidi.h index 311dafe6cc4b..f6cbef78db62 100644 --- a/include/sound/rawmidi.h +++ b/include/sound/rawmidi.h | |||
@@ -28,6 +28,7 @@ | |||
28 | #include <linux/wait.h> | 28 | #include <linux/wait.h> |
29 | #include <linux/mutex.h> | 29 | #include <linux/mutex.h> |
30 | #include <linux/workqueue.h> | 30 | #include <linux/workqueue.h> |
31 | #include <linux/device.h> | ||
31 | 32 | ||
32 | #if defined(CONFIG_SND_SEQUENCER) || defined(CONFIG_SND_SEQUENCER_MODULE) | 33 | #if defined(CONFIG_SND_SEQUENCER) || defined(CONFIG_SND_SEQUENCER_MODULE) |
33 | #include <sound/seq_device.h> | 34 | #include <sound/seq_device.h> |
@@ -139,7 +140,8 @@ struct snd_rawmidi { | |||
139 | struct mutex open_mutex; | 140 | struct mutex open_mutex; |
140 | wait_queue_head_t open_wait; | 141 | wait_queue_head_t open_wait; |
141 | 142 | ||
142 | struct snd_info_entry *dev; | 143 | struct device dev; |
144 | |||
143 | struct snd_info_entry *proc_entry; | 145 | struct snd_info_entry *proc_entry; |
144 | 146 | ||
145 | #if defined(CONFIG_SND_SEQUENCER) || defined(CONFIG_SND_SEQUENCER_MODULE) | 147 | #if defined(CONFIG_SND_SEQUENCER) || defined(CONFIG_SND_SEQUENCER_MODULE) |