Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7d9e7986 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

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: default avatarTakashi Iwai <tiwai@suse.de>
parent fa5dfe6a

sound/x86/intel_hdmi_audio.c

+1 −18
Original line number Diff line number Diff line
@@ -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);

}



/*

sound/x86/intel_hdmi_audio.h

+0 −3
Original line number Diff line number Diff line
@@ -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 {