summaryrefslogtreecommitdiffstats
path: root/sound/x86/intel_hdmi_audio.h
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2017-02-02 14:57:22 +0100
committerTakashi Iwai <tiwai@suse.de>2017-02-03 17:36:35 +0100
commitf69bd104b5cded0db547636fddd9512d7e6cfbf3 (patch)
tree9ce92a9713217d671d86c357fc917c19229e27b5 /sound/x86/intel_hdmi_audio.h
parent182cdf23dbf6672954ac646871bf5902050268c7 (diff)
downloadop-kernel-dev-f69bd104b5cded0db547636fddd9512d7e6cfbf3.zip
op-kernel-dev-f69bd104b5cded0db547636fddd9512d7e6cfbf3.tar.gz
ALSA: x86: Move stream status into pcm_stream_info
The only remaining field in struct had_stream_data is stream_type that holds the current stream status. Such information fits better in struct pcm_stream_info, so move it as a boolean "running" field to be clearer. This allows us to get rid or had_stream_data definition and references. Also, the superfluous status check get removed in a couple of places where we can call PCM helpers in anyway. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/x86/intel_hdmi_audio.h')
-rw-r--r--sound/x86/intel_hdmi_audio.h6
1 files changed, 1 insertions, 5 deletions
diff --git a/sound/x86/intel_hdmi_audio.h b/sound/x86/intel_hdmi_audio.h
index 6e5a197..2804e94 100644
--- a/sound/x86/intel_hdmi_audio.h
+++ b/sound/x86/intel_hdmi_audio.h
@@ -76,6 +76,7 @@ struct pcm_stream_info {
u64 buffer_rendered;
u32 ring_buf_size;
int substream_refcount;
+ bool running;
};
struct ring_buf_info {
@@ -84,10 +85,6 @@ struct ring_buf_info {
u8 is_valid;
};
-struct had_stream_data {
- enum had_status_stream stream_type;
-};
-
/**
* struct snd_intelhad - intelhad driver structure
*
@@ -115,7 +112,6 @@ struct snd_intelhad {
enum intel_had_aud_buf_type curr_buf;
int valid_buf_cnt;
unsigned int aes_bits;
- struct had_stream_data stream_data;
spinlock_t had_spinlock;
enum intel_had_aud_buf_type buff_done;
struct device *dev;
OpenPOWER on IntegriCloud