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

Unverified Commit de983347 authored by Hans de Goede's avatar Hans de Goede Committed by Mark Brown
Browse files

ASoC: Intel: sst: Remove unused STREAM_DECODE and STREAM_RESET states 



STREAM_DECODE is completely unused, status == STREAM_RESET was checked
for, but never set, remove both.

Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 8cf732bb

sound/soc/intel/atom/sst/sst.h

+1 −3
Original line number Diff line number Diff line
@@ -65,9 +65,7 @@ enum sst_stream_states { 
	STREAM_UN_INIT	= 0,	/* Freed/Not used stream */

	STREAM_RUNNING	= 1,	/* Running */

	STREAM_PAUSED	= 2,	/* Paused stream */

	STREAM_DECODE	= 3,	/* stream is in decoding only state */

	STREAM_INIT	= 4,	/* stream init, waiting for data */

	STREAM_RESET	= 5,	/* force reset on recovery */

	STREAM_INIT	= 3,	/* stream init, waiting for data */

};



enum sst_ram_type {

sound/soc/intel/atom/sst/sst_drv_interface.c

+0 −19
Original line number Diff line number Diff line
@@ -238,16 +238,7 @@ static int sst_cdev_close(struct device *dev, unsigned int str_id) 
		return -EINVAL;

	}



	if (stream->status == STREAM_RESET) {

		dev_dbg(dev, "stream in reset state...\n");

		stream->status = STREAM_UN_INIT;



		retval = 0;

		goto put;

	}



	retval = sst_free_stream(ctx, str_id);

put:

	stream->compr_cb_param = NULL;

	stream->compr_cb = NULL;
@@ -256,7 +247,6 @@ static int sst_cdev_close(struct device *dev, unsigned int str_id) 


	dev_dbg(dev, "End\n");

	return retval;



}



static int sst_cdev_ack(struct device *dev, unsigned int str_id,
@@ -486,16 +476,7 @@ static int sst_close_pcm_stream(struct device *dev, unsigned int str_id) 
		return -EINVAL;

	}



	if (stream->status == STREAM_RESET) {

		/* silently fail here as we have cleaned the stream earlier */

		dev_dbg(ctx->dev, "stream in reset state...\n");



		retval = 0;

		goto put;

	}



	retval = free_stream_context(ctx, str_id);

put:

	stream->pcm_substream = NULL;

	stream->status = STREAM_UN_INIT;

	stream->period_elapsed = NULL;