From: Mark Brown <broonie@kernel.org>
Cc: alsa-devel@alsa-project.org, kernel@stlinux.com,
Takashi Iwai <tiwai@suse.de>,
arnaud.pouliquen@st.com, lgirdwood@gmail.com, broonie@kernel.org,
Moise Gergaud <moise.gergaud@st.com>
Subject: Applied "ASoC: sti-sas: add missing return in messages strings" to the asoc tree
Date: Wed, 26 Oct 2016 11:45:57 +0100 [thread overview]
Message-ID: <E1bzLiX-0005Kj-7x@debutante> (raw)
In-Reply-To: <1477320177-30130-7-git-send-email-arnaud.pouliquen@st.com>
The patch
ASoC: sti-sas: add missing return in messages strings
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying
to this mail.
Thanks,
Mark
>From 92591efabc013fa791f96df881aafcc104ba759d Mon Sep 17 00:00:00 2001
From: Arnaud Pouliquen <arnaud.pouliquen@st.com>
Date: Mon, 24 Oct 2016 16:42:56 +0200
Subject: [PATCH] ASoC: sti-sas: add missing return in messages strings
Signed-off-by: Arnaud Pouliquen <arnaud.pouliquen@st.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
sound/soc/codecs/sti-sas.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/sound/soc/codecs/sti-sas.c b/sound/soc/codecs/sti-sas.c
index 1488f4fb1c5e..21d087be2e93 100644
--- a/sound/soc/codecs/sti-sas.c
+++ b/sound/soc/codecs/sti-sas.c
@@ -124,7 +124,7 @@ static int sti_sas_init_sas_registers(struct snd_soc_codec *codec,
ret = snd_soc_update_bits(codec, STIH407_AUDIO_GLUE_CTRL,
SPDIF_BIPHASE_IDLE_MASK, 0);
if (ret < 0) {
- dev_err(codec->dev, "Failed to update SPDIF registers");
+ dev_err(codec->dev, "Failed to update SPDIF registers\n");
return ret;
}
@@ -144,7 +144,7 @@ static int sti_sas_init_sas_registers(struct snd_soc_codec *codec,
STIH407_DAC_SOFTMUTE_MASK);
if (ret < 0) {
- dev_err(codec->dev, "Failed to update DAC registers");
+ dev_err(codec->dev, "Failed to update DAC registers\n");
return ret;
}
@@ -292,13 +292,13 @@ static int sti_sas_prepare(struct snd_pcm_substream *substream,
switch (dai->id) {
case STI_SAS_DAI_SPDIF_OUT:
if ((drvdata->spdif.mclk / runtime->rate) != 128) {
- dev_err(codec->dev, "unexpected mclk-fs ratio");
+ dev_err(codec->dev, "unexpected mclk-fs ratio\n");
return -EINVAL;
}
break;
case STI_SAS_DAI_ANALOG_OUT:
if ((drvdata->dac.mclk / runtime->rate) != 256) {
- dev_err(codec->dev, "unexpected mclk-fs ratio");
+ dev_err(codec->dev, "unexpected mclk-fs ratio\n");
return -EINVAL;
}
break;
@@ -423,7 +423,7 @@ static int sti_sas_driver_probe(struct platform_device *pdev)
/* Populate data structure depending on compatibility */
of_id = of_match_node(sti_sas_dev_match, pnode);
if (!of_id->data) {
- dev_err(&pdev->dev, "data associated to device is missing");
+ dev_err(&pdev->dev, "data associated to device is missing\n");
return -EINVAL;
}
--
2.8.1
next prev parent reply other threads:[~2016-10-26 10:46 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-24 14:42 [PATCH 0/7] ASoC: sti audio fixes and legacy cleaning Arnaud Pouliquen
2016-10-24 14:42 ` [PATCH 1/7] ASoC: sti: fix errors management Arnaud Pouliquen
2016-10-26 10:46 ` Applied "ASoC: sti: fix errors management" to the asoc tree Mark Brown
2016-10-24 14:42 ` [PATCH 2/7] ASoC: sti: fix channel status update after playback start Arnaud Pouliquen
2016-10-26 10:46 ` Applied "ASoC: sti: fix channel status update after playback start" to the asoc tree Mark Brown
2016-10-24 14:42 ` [PATCH 3/7] ASoC: sti: reset refactoring Arnaud Pouliquen
2016-10-26 10:46 ` Applied "ASoC: sti: reset refactoring" to the asoc tree Mark Brown
2016-10-24 14:42 ` [PATCH 4/7] ASoC: sti: clean unused include Arnaud Pouliquen
2016-10-26 10:46 ` Applied "ASoC: sti: clean unused include" to the asoc tree Mark Brown
2016-10-24 14:42 ` [PATCH 5/7] ASoC: codec: clean legacy in sti-sas Arnaud Pouliquen
2016-10-26 10:46 ` Applied "ASoC: sti-sas: clean legacy in sti-sas" to the asoc tree Mark Brown
2016-10-24 14:42 ` [PATCH 6/7] ASoC: sti: sti-sas: add missing return in messages strings Arnaud Pouliquen
2016-10-26 10:45 ` Mark Brown [this message]
2016-10-24 14:42 ` [PATCH 7/7] ASoc: codec: sti enable fast io for regmap Arnaud Pouliquen
2016-10-26 10:45 ` Applied "ASoC: sti-sas: enable fast io for regmap" to the asoc tree Mark Brown
2016-10-26 10:40 ` [PATCH 0/7] ASoC: sti audio fixes and legacy cleaning Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=E1bzLiX-0005Kj-7x@debutante \
--to=broonie@kernel.org \
--cc=alsa-devel@alsa-project.org \
--cc=arnaud.pouliquen@st.com \
--cc=kernel@stlinux.com \
--cc=lgirdwood@gmail.com \
--cc=moise.gergaud@st.com \
--cc=tiwai@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox