summaryrefslogtreecommitdiffstats
path: root/include/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2015-01-29 17:55:52 +0100
committerTakashi Iwai <tiwai@suse.de>2015-02-02 14:42:43 +0100
commitaee5012fbb77dad6179c44d83d531ad62dd8098a (patch)
tree82c169a7d567a52f0f48a5bcdeb027574bebfc6f /include/sound
parentef46c7af93f98d07cd0ed891f93a26d135785526 (diff)
downloadop-kernel-dev-aee5012fbb77dad6179c44d83d531ad62dd8098a.zip
op-kernel-dev-aee5012fbb77dad6179c44d83d531ad62dd8098a.tar.gz
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.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/sound/rawmidi.h b/include/sound/rawmidi.h
index 311dafe..f6cbef7 100644
--- a/include/sound/rawmidi.h
+++ b/include/sound/rawmidi.h
@@ -28,6 +28,7 @@
#include <linux/wait.h>
#include <linux/mutex.h>
#include <linux/workqueue.h>
+#include <linux/device.h>
#if defined(CONFIG_SND_SEQUENCER) || defined(CONFIG_SND_SEQUENCER_MODULE)
#include <sound/seq_device.h>
@@ -139,7 +140,8 @@ struct snd_rawmidi {
struct mutex open_mutex;
wait_queue_head_t open_wait;
- struct snd_info_entry *dev;
+ struct device dev;
+
struct snd_info_entry *proc_entry;
#if defined(CONFIG_SND_SEQUENCER) || defined(CONFIG_SND_SEQUENCER_MODULE)
OpenPOWER on IntegriCloud