mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-06 08:46:46 +00:00
Code Issues Releases Wiki Activity

ASoC: compress: Fix up some trivial formatting issues

Browse source 
Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Acked-by: Vinod Koul <vkoul@kernel.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Charles Keepax 2018-04-26 17:30:07 +01:00 committed by Mark Brown
parent ca76db6c7e
commit 89027d9ebb
No known key found for this signature in database
GPG key ID: 24D68B725D5487D0
1 changed files with 13 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
sound/soc/soc-compress.c
View file

@ -287,8 +287,8 @@ static int soc_compr_free(struct snd_compr_stream *cstream)
if (cstream->direction == SND_COMPRESS_PLAYBACK) { if (cstream->direction == SND_COMPRESS_PLAYBACK) {
if (snd_soc_runtime_ignore_pmdown_time(rtd)) { if (snd_soc_runtime_ignore_pmdown_time(rtd)) {
snd_soc_dapm_stream_event(rtd, snd_soc_dapm_stream_event(rtd,
SNDRV_PCM_STREAM_PLAYBACK, SNDRV_PCM_STREAM_PLAYBACK,
SND_SOC_DAPM_STREAM_STOP); SND_SOC_DAPM_STREAM_STOP);
} else { } else {
rtd->pop_wait = 1; rtd->pop_wait = 1;
queue_delayed_work(system_power_efficient_wq, queue_delayed_work(system_power_efficient_wq,
@ -298,8 +298,8 @@ static int soc_compr_free(struct snd_compr_stream *cstream)
} else { } else {
/* capture streams can be powered down now */ /* capture streams can be powered down now */
snd_soc_dapm_stream_event(rtd, snd_soc_dapm_stream_event(rtd,
SNDRV_PCM_STREAM_CAPTURE, SNDRV_PCM_STREAM_CAPTURE,
SND_SOC_DAPM_STREAM_STOP); SND_SOC_DAPM_STREAM_STOP);
} }
mutex_unlock(&rtd->pcm_mutex); mutex_unlock(&rtd->pcm_mutex);
@ -428,7 +428,6 @@ static int soc_compr_trigger_fe(struct snd_compr_stream *cstream, int cmd)
else else
stream = SNDRV_PCM_STREAM_CAPTURE; stream = SNDRV_PCM_STREAM_CAPTURE;
mutex_lock_nested(&fe->card->mutex, SND_SOC_CARD_CLASS_RUNTIME); mutex_lock_nested(&fe->card->mutex, SND_SOC_CARD_CLASS_RUNTIME);
if (cpu_dai->driver->cops && cpu_dai->driver->cops->trigger) { if (cpu_dai->driver->cops && cpu_dai->driver->cops->trigger) {
@ -522,10 +521,10 @@ static int soc_compr_set_params(struct snd_compr_stream *cstream,
if (cstream->direction == SND_COMPRESS_PLAYBACK) if (cstream->direction == SND_COMPRESS_PLAYBACK)
snd_soc_dapm_stream_event(rtd, SNDRV_PCM_STREAM_PLAYBACK, snd_soc_dapm_stream_event(rtd, SNDRV_PCM_STREAM_PLAYBACK,
SND_SOC_DAPM_STREAM_START); SND_SOC_DAPM_STREAM_START);
else else
snd_soc_dapm_stream_event(rtd, SNDRV_PCM_STREAM_CAPTURE, snd_soc_dapm_stream_event(rtd, SNDRV_PCM_STREAM_CAPTURE,
SND_SOC_DAPM_STREAM_START); SND_SOC_DAPM_STREAM_START);
/* cancel any delayed stream shutdown that is pending */ /* cancel any delayed stream shutdown that is pending */
rtd->pop_wait = 0; rtd->pop_wait = 0;
@ -541,7 +540,7 @@ static int soc_compr_set_params(struct snd_compr_stream *cstream,
} }
static int soc_compr_set_params_fe(struct snd_compr_stream *cstream, static int soc_compr_set_params_fe(struct snd_compr_stream *cstream,
struct snd_compr_params *params) struct snd_compr_params *params)
{ {
struct snd_soc_pcm_runtime *fe = cstream->private_data; struct snd_soc_pcm_runtime *fe = cstream->private_data;
struct snd_pcm_substream *fe_substream = struct snd_pcm_substream *fe_substream =
@ -612,7 +611,7 @@ static int soc_compr_set_params_fe(struct snd_compr_stream *cstream,
} }
static int soc_compr_get_params(struct snd_compr_stream *cstream, static int soc_compr_get_params(struct snd_compr_stream *cstream,
struct snd_codec *params) struct snd_codec *params)
{ {
struct snd_soc_pcm_runtime *rtd = cstream->private_data; struct snd_soc_pcm_runtime *rtd = cstream->private_data;
struct snd_soc_component *component; struct snd_soc_component *component;
@ -646,7 +645,7 @@ static int soc_compr_get_params(struct snd_compr_stream *cstream,
} }
static int soc_compr_get_caps(struct snd_compr_stream *cstream, static int soc_compr_get_caps(struct snd_compr_stream *cstream,
struct snd_compr_caps *caps) struct snd_compr_caps *caps)
{ {
struct snd_soc_pcm_runtime *rtd = cstream->private_data; struct snd_soc_pcm_runtime *rtd = cstream->private_data;
struct snd_soc_component *component; struct snd_soc_component *component;
@ -672,7 +671,7 @@ static int soc_compr_get_caps(struct snd_compr_stream *cstream,
} }
static int soc_compr_get_codec_caps(struct snd_compr_stream *cstream, static int soc_compr_get_codec_caps(struct snd_compr_stream *cstream,
struct snd_compr_codec_caps *codec) struct snd_compr_codec_caps *codec)
{ {
struct snd_soc_pcm_runtime *rtd = cstream->private_data; struct snd_soc_pcm_runtime *rtd = cstream->private_data;
struct snd_soc_component *component; struct snd_soc_component *component;
@ -731,7 +730,7 @@ static int soc_compr_ack(struct snd_compr_stream *cstream, size_t bytes)
} }
static int soc_compr_pointer(struct snd_compr_stream *cstream, static int soc_compr_pointer(struct snd_compr_stream *cstream,
struct snd_compr_tstamp *tstamp) struct snd_compr_tstamp *tstamp)
{ {
struct snd_soc_pcm_runtime *rtd = cstream->private_data; struct snd_soc_pcm_runtime *rtd = cstream->private_data;
struct snd_soc_component *component; struct snd_soc_component *component;
@ -786,7 +785,7 @@ static int soc_compr_copy(struct snd_compr_stream *cstream,
} }
static int soc_compr_set_metadata(struct snd_compr_stream *cstream, static int soc_compr_set_metadata(struct snd_compr_stream *cstream,
struct snd_compr_metadata *metadata) struct snd_compr_metadata *metadata)
{ {
struct snd_soc_pcm_runtime *rtd = cstream->private_data; struct snd_soc_pcm_runtime *rtd = cstream->private_data;
struct snd_soc_component *component; struct snd_soc_component *component;
@ -816,7 +815,7 @@ static int soc_compr_set_metadata(struct snd_compr_stream *cstream,
} }
static int soc_compr_get_metadata(struct snd_compr_stream *cstream, static int soc_compr_get_metadata(struct snd_compr_stream *cstream,
struct snd_compr_metadata *metadata) struct snd_compr_metadata *metadata)
{ {
struct snd_soc_pcm_runtime *rtd = cstream->private_data; struct snd_soc_pcm_runtime *rtd = cstream->private_data;
struct snd_soc_component *component; struct snd_soc_component *component;
@ -976,7 +975,6 @@ int snd_soc_new_compress(struct snd_soc_pcm_runtime *rtd, int num)
break; break;
} }
mutex_init(&compr->lock); mutex_init(&compr->lock);
ret = snd_compress_new(rtd->card->snd_card, num, direction, ret = snd_compress_new(rtd->card->snd_card, num, direction,
new_name, compr); new_name, compr);