summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2017-02-01 22:25:58 +0100
committerTakashi Iwai <tiwai@suse.de>2017-02-03 17:35:56 +0100
commit7d9e79869ba2a8a552f4c2cf1df44cf9a0822f02 (patch)
tree443c0c8f7a7deec8022ff19778706f5615071d58 /sound
parentfa5dfe6a01481a8fa00469be42ea32beb468a501 (diff)
ALSA: x86: Drop unused fields from pcm_stream_info
The struct pcm_stream_info contains a few unused or useless fields. str_id is always zero, buffer_ptr is volatile, never read, and sfreq is nowhere referred. Kill them. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r--sound/x86/intel_hdmi_audio.c19
-rw-r--r--sound/x86/intel_hdmi_audio.h3
2 files changed, 1 insertions, 21 deletions
diff --git a/sound/x86/intel_hdmi_audio.c b/sound/x86/intel_hdmi_audio.c
index 88e9a91f28a0..907e420cd90d 100644
--- a/sound/x86/intel_hdmi_audio.c
+++ b/sound/x86/intel_hdmi_audio.c
@@ -1019,8 +1019,6 @@ static int snd_intelhad_close(struct snd_pcm_substream *substream)
intelhaddata = snd_pcm_substream_chip(substream);
intelhaddata->stream_info.buffer_rendered = 0;
- intelhaddata->stream_info.buffer_ptr = 0;
- intelhaddata->stream_info.str_id = 0;
intelhaddata->stream_info.had_substream = NULL;
/* Check if following drv_status modification is required - VA */
@@ -1132,7 +1130,6 @@ static int snd_intelhad_pcm_trigger(struct snd_pcm_substream *substream,
case SNDRV_PCM_TRIGGER_STOP:
spin_lock(&intelhaddata->had_spinlock);
- intelhaddata->stream_info.str_id = 0;
intelhaddata->curr_buf = 0;
/* Stop reporting BUFFER_DONE/UNDERRUN to above layers */
@@ -1188,19 +1185,8 @@ static int snd_intelhad_pcm_prepare(struct snd_pcm_substream *substream)
dev_dbg(intelhaddata->dev, "rate=%d\n", runtime->rate);
dev_dbg(intelhaddata->dev, "channels=%d\n", runtime->channels);
- if (intelhaddata->stream_info.str_id) {
- dev_dbg(intelhaddata->dev,
- "_prepare is called for existing str_id#%d\n",
- intelhaddata->stream_info.str_id);
- retval = snd_intelhad_pcm_trigger(substream,
- SNDRV_PCM_TRIGGER_STOP);
- return retval;
- }
-
intelhaddata->stream_info.had_substream = substream;
- intelhaddata->stream_info.buffer_ptr = 0;
intelhaddata->stream_info.buffer_rendered = 0;
- intelhaddata->stream_info.sfreq = substream->runtime->rate;
/* Get N value in KHz */
disp_samp_freq = intelhaddata->tmds_clock_speed;
@@ -1292,10 +1278,7 @@ static snd_pcm_uframes_t snd_intelhad_pcm_pointer(
intelhaddata->stream_info.ring_buf_size,
&(bytes_rendered));
- intelhaddata->stream_info.buffer_ptr = bytes_to_frames(
- substream->runtime,
- bytes_rendered + t);
- return intelhaddata->stream_info.buffer_ptr;
+ return bytes_to_frames(substream->runtime, bytes_rendered + t);
}
/*
diff --git a/sound/x86/intel_hdmi_audio.h b/sound/x86/intel_hdmi_audio.h
index 3bd2bb60f1f1..7bd273ec3275 100644
--- a/sound/x86/intel_hdmi_audio.h
+++ b/sound/x86/intel_hdmi_audio.h
@@ -72,12 +72,9 @@
#define AUD_CONFIG_CH_MASK 0x70
struct pcm_stream_info {
- int str_id;
struct snd_pcm_substream *had_substream;
- u32 buffer_ptr;
u64 buffer_rendered;
u32 ring_buf_size;
- int sfreq;
};
struct ring_buf_info {