From: Mark Brown <broonie@kernel.org> To: Kirill Marinushkin <kmarinushkin@birdec.tech> Cc: Mark Brown <broonie@kernel.org>, Mark Brown <broonie@kernel.org>, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, Takashi Iwai <tiwai@suse.com>, Liam Girdwood <lgirdwood@gmail.com>, Peter Ujfalusi <peter.ujfalusi@ti.com>, Vishwas A Deshpande <vishwas.a.deshpande@ti.com>, M R Swami Reddy <mr.swami.reddy@ti.com>, Kevin Cernekee <cernekee@chromium.org>, alsa-devel@alsa-project.org Subject: Applied "ASoC: pcm3060: Improve legibility of if-statements" to the asoc tree Date: Wed, 29 Aug 2018 12:31:27 +0100 (BST) [thread overview] Message-ID: <20180829113127.6CD381124859@debutante.sirena.org.uk> (raw) In-Reply-To: <20180828214231.10164-2-kmarinushkin@birdec.tech> The patch ASoC: pcm3060: Improve legibility of if-statements has been applied to the asoc tree at https://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 080aaf10892eec4b359126473e582f62ebb09496 Mon Sep 17 00:00:00 2001 From: Kirill Marinushkin <kmarinushkin@birdec.tech> Date: Tue, 28 Aug 2018 23:42:31 +0200 Subject: [PATCH] ASoC: pcm3060: Improve legibility of if-statements Modified some if-statements to make them more clear Signed-off-by: Kirill Marinushkin <kmarinushkin@birdec.tech> Signed-off-by: Mark Brown <broonie@kernel.org> --- sound/soc/codecs/pcm3060.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/pcm3060.c b/sound/soc/codecs/pcm3060.c index 5b9718fa766d..494d9d662be8 100644 --- a/sound/soc/codecs/pcm3060.c +++ b/sound/soc/codecs/pcm3060.c @@ -68,7 +68,10 @@ static int pcm3060_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) return -EINVAL; } - reg = (dai->id == PCM3060_DAI_ID_DAC ? PCM3060_REG67 : PCM3060_REG72); + if (dai->id == PCM3060_DAI_ID_DAC) + reg = PCM3060_REG67; + else + reg = PCM3060_REG72; regmap_update_bits(priv->regmap, reg, PCM3060_REG_MASK_FMT, val); @@ -124,7 +127,10 @@ static int pcm3060_hw_params(struct snd_pcm_substream *substream, } val_ready: - reg = (dai->id == PCM3060_DAI_ID_DAC ? PCM3060_REG67 : PCM3060_REG72); + if (dai->id == PCM3060_DAI_ID_DAC) + reg = PCM3060_REG67; + else + reg = PCM3060_REG72; regmap_update_bits(priv->regmap, reg, PCM3060_REG_MASK_MS, val); -- 2.18.0
WARNING: multiple messages have this Message-ID (diff)
From: Mark Brown <broonie@kernel.org> To: Kirill Marinushkin <kmarinushkin@birdec.tech> Cc: alsa-devel@alsa-project.org, Takashi Iwai <tiwai@suse.com>, Liam Girdwood <lgirdwood@gmail.com>, linux-kernel@vger.kernel.org, Peter Ujfalusi <peter.ujfalusi@ti.com>, Vishwas A Deshpande <vishwas.a.deshpande@ti.com>, Mark Brown <broonie@kernel.org>, M R Swami Reddy <mr.swami.reddy@ti.com>, Kevin Cernekee <cernekee@chromium.org> Subject: Applied "ASoC: pcm3060: Improve legibility of if-statements" to the asoc tree Date: Wed, 29 Aug 2018 12:31:27 +0100 (BST) [thread overview] Message-ID: <20180829113127.6CD381124859@debutante.sirena.org.uk> (raw) In-Reply-To: <20180828214231.10164-2-kmarinushkin@birdec.tech> The patch ASoC: pcm3060: Improve legibility of if-statements has been applied to the asoc tree at https://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 080aaf10892eec4b359126473e582f62ebb09496 Mon Sep 17 00:00:00 2001 From: Kirill Marinushkin <kmarinushkin@birdec.tech> Date: Tue, 28 Aug 2018 23:42:31 +0200 Subject: [PATCH] ASoC: pcm3060: Improve legibility of if-statements Modified some if-statements to make them more clear Signed-off-by: Kirill Marinushkin <kmarinushkin@birdec.tech> Signed-off-by: Mark Brown <broonie@kernel.org> --- sound/soc/codecs/pcm3060.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/pcm3060.c b/sound/soc/codecs/pcm3060.c index 5b9718fa766d..494d9d662be8 100644 --- a/sound/soc/codecs/pcm3060.c +++ b/sound/soc/codecs/pcm3060.c @@ -68,7 +68,10 @@ static int pcm3060_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) return -EINVAL; } - reg = (dai->id == PCM3060_DAI_ID_DAC ? PCM3060_REG67 : PCM3060_REG72); + if (dai->id == PCM3060_DAI_ID_DAC) + reg = PCM3060_REG67; + else + reg = PCM3060_REG72; regmap_update_bits(priv->regmap, reg, PCM3060_REG_MASK_FMT, val); @@ -124,7 +127,10 @@ static int pcm3060_hw_params(struct snd_pcm_substream *substream, } val_ready: - reg = (dai->id == PCM3060_DAI_ID_DAC ? PCM3060_REG67 : PCM3060_REG72); + if (dai->id == PCM3060_DAI_ID_DAC) + reg = PCM3060_REG67; + else + reg = PCM3060_REG72; regmap_update_bits(priv->regmap, reg, PCM3060_REG_MASK_MS, val); -- 2.18.0
next prev parent reply other threads:[~2018-08-29 11:31 UTC|newest] Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-08-21 16:52 [PATCH 0/1] ASoC: pcm3060: Add codec driver Kirill Marinushkin 2018-08-21 16:52 ` Kirill Marinushkin 2018-08-21 16:52 ` [PATCH 1/1] " Kirill Marinushkin 2018-08-21 16:52 ` Kirill Marinushkin 2018-08-28 19:40 ` Mark Brown 2018-08-28 19:40 ` Mark Brown 2018-08-28 21:42 ` [PATCH 1/2] ASoC: pcm3060: Improve stylistics of file comments Kirill Marinushkin 2018-08-28 21:42 ` [PATCH 2/2] ASoC: pcm3060: Improve legibility of if-statements Kirill Marinushkin 2018-08-28 21:42 ` Kirill Marinushkin 2018-08-29 11:31 ` Mark Brown [this message] 2018-08-29 11:31 ` Applied "ASoC: pcm3060: Improve legibility of if-statements" to the asoc tree Mark Brown 2018-08-29 11:31 ` Applied "ASoC: pcm3060: Improve stylistics of file comments" " Mark Brown 2018-08-29 11:31 ` Mark Brown 2018-08-28 20:28 ` Applied "ASoC: pcm3060: Add codec driver" " Mark Brown 2018-08-28 20:28 ` Mark Brown 2018-08-28 19:31 ` [PATCH 0/1] ASoC: pcm3060: Add codec driver Mark Brown 2018-08-28 19:31 ` 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=20180829113127.6CD381124859@debutante.sirena.org.uk \ --to=broonie@kernel.org \ --cc=alsa-devel@alsa-project.org \ --cc=cernekee@chromium.org \ --cc=kmarinushkin@birdec.tech \ --cc=lgirdwood@gmail.com \ --cc=linux-kernel@vger.kernel.org \ --cc=mr.swami.reddy@ti.com \ --cc=peter.ujfalusi@ti.com \ --cc=tiwai@suse.com \ --cc=vishwas.a.deshpande@ti.com \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.