* [PATCH 1/2] ASoC: cs53l30: Rename the volume controls for preamplifier
@ 2016-05-31 23:06 Nicolin Chen
2016-05-31 23:06 ` [PATCH 2/2] ASoC: cs53l30: Check return value of regcache_sync() Nicolin Chen
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Nicolin Chen @ 2016-05-31 23:06 UTC (permalink / raw)
To: broonie; +Cc: lgirdwood, brian.austin, Paul.Handrigan, linux-kernel, alsa-devel
Volume controls should end with 'Volume', so this patch renames them for
ADC preamplifier.
Signed-off-by: Nicolin Chen <nicoleotsuka@gmail.com>
---
sound/soc/codecs/cs53l30.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sound/soc/codecs/cs53l30.c b/sound/soc/codecs/cs53l30.c
index 714e579..9aff449 100644
--- a/sound/soc/codecs/cs53l30.c
+++ b/sound/soc/codecs/cs53l30.c
@@ -331,10 +331,10 @@ static const struct snd_kcontrol_new cs53l30_snd_controls[] = {
SOC_SINGLE_TLV("ADC2 NG Boost Volume", CS53L30_ADC2_NG_CTL,
CS53L30_ADCx_NG_BOOST_SHIFT, 1, 0, adc_ng_boost_tlv),
- SOC_DOUBLE_R_TLV("ADC1 Pre Amp Gain", CS53L30_ADC1A_AFE_CTL,
+ SOC_DOUBLE_R_TLV("ADC1 Preamplifier Volume", CS53L30_ADC1A_AFE_CTL,
CS53L30_ADC1B_AFE_CTL, CS53L30_ADCxy_PREAMP_SHIFT,
2, 0, pga_preamp_tlv),
- SOC_DOUBLE_R_TLV("ADC2 Pre Amp Gain", CS53L30_ADC2A_AFE_CTL,
+ SOC_DOUBLE_R_TLV("ADC2 Preamplifier Volume", CS53L30_ADC2A_AFE_CTL,
CS53L30_ADC2B_AFE_CTL, CS53L30_ADCxy_PREAMP_SHIFT,
2, 0, pga_preamp_tlv),
--
2.1.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 2/2] ASoC: cs53l30: Check return value of regcache_sync()
2016-05-31 23:06 [PATCH 1/2] ASoC: cs53l30: Rename the volume controls for preamplifier Nicolin Chen
@ 2016-05-31 23:06 ` Nicolin Chen
2016-06-01 1:28 ` Handrigan, Paul
2016-06-02 10:18 ` Applied "ASoC: cs53l30: Check return value of regcache_sync()" to the asoc tree Mark Brown
2016-06-01 1:27 ` [PATCH 1/2] ASoC: cs53l30: Rename the volume controls for preamplifier Handrigan, Paul
2016-06-02 10:18 ` Applied "ASoC: cs53l30: Rename the volume controls for preamplifier" to the asoc tree Mark Brown
2 siblings, 2 replies; 6+ messages in thread
From: Nicolin Chen @ 2016-05-31 23:06 UTC (permalink / raw)
To: broonie; +Cc: lgirdwood, brian.austin, Paul.Handrigan, linux-kernel, alsa-devel
Regcache_sync() might fail. So this patch adds a return value Check for it.
Signed-off-by: Nicolin Chen <nicoleotsuka@gmail.com>
---
sound/soc/codecs/cs53l30.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/sound/soc/codecs/cs53l30.c b/sound/soc/codecs/cs53l30.c
index 9aff449..ac90dd7 100644
--- a/sound/soc/codecs/cs53l30.c
+++ b/sound/soc/codecs/cs53l30.c
@@ -1055,7 +1055,11 @@ static int cs53l30_runtime_resume(struct device *dev)
gpiod_set_value_cansleep(cs53l30->reset_gpio, 1);
regcache_cache_only(cs53l30->regmap, false);
- regcache_sync(cs53l30->regmap);
+ ret = regcache_sync(cs53l30->regmap);
+ if (ret) {
+ dev_err(dev, "failed to synchronize regcache: %d\n", ret);
+ return ret;
+ }
return 0;
}
--
2.1.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 2/2] ASoC: cs53l30: Check return value of regcache_sync()
2016-05-31 23:06 ` [PATCH 2/2] ASoC: cs53l30: Check return value of regcache_sync() Nicolin Chen
@ 2016-06-01 1:28 ` Handrigan, Paul
2016-06-02 10:18 ` Applied "ASoC: cs53l30: Check return value of regcache_sync()" to the asoc tree Mark Brown
1 sibling, 0 replies; 6+ messages in thread
From: Handrigan, Paul @ 2016-06-01 1:28 UTC (permalink / raw)
To: Nicolin Chen, broonie@kernel.org
Cc: lgirdwood@gmail.com, Austin, Brian, linux-kernel@vger.kernel.org,
alsa-devel@alsa-project.org
On 5/31/16, 6:06 PM, "Nicolin Chen" <nicoleotsuka@gmail.com> wrote:
>Regcache_sync() might fail. So this patch adds a return value Check for
>it.
>
>Signed-off-by: Nicolin Chen <nicoleotsuka@gmail.com>
>---
> sound/soc/codecs/cs53l30.c | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
>diff --git a/sound/soc/codecs/cs53l30.c b/sound/soc/codecs/cs53l30.c
>index 9aff449..ac90dd7 100644
>--- a/sound/soc/codecs/cs53l30.c
>+++ b/sound/soc/codecs/cs53l30.c
>@@ -1055,7 +1055,11 @@ static int cs53l30_runtime_resume(struct device
>*dev)
> gpiod_set_value_cansleep(cs53l30->reset_gpio, 1);
>
> regcache_cache_only(cs53l30->regmap, false);
>- regcache_sync(cs53l30->regmap);
>+ ret = regcache_sync(cs53l30->regmap);
>+ if (ret) {
>+ dev_err(dev, "failed to synchronize regcache: %d\n", ret);
>+ return ret;
>+ }
>
> return 0;
> }
>--
>2.1.4
Acked-by: Paul Handrigan <Paul.Handrigan@cirrus.com>
^ permalink raw reply [flat|nested] 6+ messages in thread* Applied "ASoC: cs53l30: Check return value of regcache_sync()" to the asoc tree
2016-05-31 23:06 ` [PATCH 2/2] ASoC: cs53l30: Check return value of regcache_sync() Nicolin Chen
2016-06-01 1:28 ` Handrigan, Paul
@ 2016-06-02 10:18 ` Mark Brown
1 sibling, 0 replies; 6+ messages in thread
From: Mark Brown @ 2016-06-02 10:18 UTC (permalink / raw)
To: Nicolin Chen; +Cc: Paul Handrigan, Mark Brown
The patch
ASoC: cs53l30: Check return value of regcache_sync()
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 87a4bb11355f8b59c0d865a96044b5853f6c222e Mon Sep 17 00:00:00 2001
From: Nicolin Chen <nicoleotsuka@gmail.com>
Date: Tue, 31 May 2016 16:06:39 -0700
Subject: [PATCH] ASoC: cs53l30: Check return value of regcache_sync()
Regcache_sync() might fail. So this patch adds a return value Check for it.
Signed-off-by: Nicolin Chen <nicoleotsuka@gmail.com>
Acked-by: Paul Handrigan <Paul.Handrigan@cirrus.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
sound/soc/codecs/cs53l30.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/sound/soc/codecs/cs53l30.c b/sound/soc/codecs/cs53l30.c
index 9aff449e57af..ac90dd79857e 100644
--- a/sound/soc/codecs/cs53l30.c
+++ b/sound/soc/codecs/cs53l30.c
@@ -1055,7 +1055,11 @@ static int cs53l30_runtime_resume(struct device *dev)
gpiod_set_value_cansleep(cs53l30->reset_gpio, 1);
regcache_cache_only(cs53l30->regmap, false);
- regcache_sync(cs53l30->regmap);
+ ret = regcache_sync(cs53l30->regmap);
+ if (ret) {
+ dev_err(dev, "failed to synchronize regcache: %d\n", ret);
+ return ret;
+ }
return 0;
}
--
2.8.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] ASoC: cs53l30: Rename the volume controls for preamplifier
2016-05-31 23:06 [PATCH 1/2] ASoC: cs53l30: Rename the volume controls for preamplifier Nicolin Chen
2016-05-31 23:06 ` [PATCH 2/2] ASoC: cs53l30: Check return value of regcache_sync() Nicolin Chen
@ 2016-06-01 1:27 ` Handrigan, Paul
2016-06-02 10:18 ` Applied "ASoC: cs53l30: Rename the volume controls for preamplifier" to the asoc tree Mark Brown
2 siblings, 0 replies; 6+ messages in thread
From: Handrigan, Paul @ 2016-06-01 1:27 UTC (permalink / raw)
To: Nicolin Chen, broonie@kernel.org
Cc: lgirdwood@gmail.com, Austin, Brian, linux-kernel@vger.kernel.org,
alsa-devel@alsa-project.org
On 5/31/16, 6:06 PM, "Nicolin Chen" <nicoleotsuka@gmail.com> wrote:
>Volume controls should end with 'Volume', so this patch renames them for
>ADC preamplifier.
>
>Signed-off-by: Nicolin Chen <nicoleotsuka@gmail.com>
>---
> sound/soc/codecs/cs53l30.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
>diff --git a/sound/soc/codecs/cs53l30.c b/sound/soc/codecs/cs53l30.c
>index 714e579..9aff449 100644
>--- a/sound/soc/codecs/cs53l30.c
>+++ b/sound/soc/codecs/cs53l30.c
>@@ -331,10 +331,10 @@ static const struct snd_kcontrol_new
>cs53l30_snd_controls[] = {
> SOC_SINGLE_TLV("ADC2 NG Boost Volume", CS53L30_ADC2_NG_CTL,
> CS53L30_ADCx_NG_BOOST_SHIFT, 1, 0, adc_ng_boost_tlv),
>
>- SOC_DOUBLE_R_TLV("ADC1 Pre Amp Gain", CS53L30_ADC1A_AFE_CTL,
>+ SOC_DOUBLE_R_TLV("ADC1 Preamplifier Volume", CS53L30_ADC1A_AFE_CTL,
> CS53L30_ADC1B_AFE_CTL, CS53L30_ADCxy_PREAMP_SHIFT,
> 2, 0, pga_preamp_tlv),
>- SOC_DOUBLE_R_TLV("ADC2 Pre Amp Gain", CS53L30_ADC2A_AFE_CTL,
>+ SOC_DOUBLE_R_TLV("ADC2 Preamplifier Volume", CS53L30_ADC2A_AFE_CTL,
> CS53L30_ADC2B_AFE_CTL, CS53L30_ADCxy_PREAMP_SHIFT,
> 2, 0, pga_preamp_tlv),
>
>--
>2.1.4
Acked-by: Paul Handrigan <Paul.Handrigan@cirrus.com>
^ permalink raw reply [flat|nested] 6+ messages in thread* Applied "ASoC: cs53l30: Rename the volume controls for preamplifier" to the asoc tree
2016-05-31 23:06 [PATCH 1/2] ASoC: cs53l30: Rename the volume controls for preamplifier Nicolin Chen
2016-05-31 23:06 ` [PATCH 2/2] ASoC: cs53l30: Check return value of regcache_sync() Nicolin Chen
2016-06-01 1:27 ` [PATCH 1/2] ASoC: cs53l30: Rename the volume controls for preamplifier Handrigan, Paul
@ 2016-06-02 10:18 ` Mark Brown
2 siblings, 0 replies; 6+ messages in thread
From: Mark Brown @ 2016-06-02 10:18 UTC (permalink / raw)
To: Nicolin Chen; +Cc: Paul Handrigan, Mark Brown
The patch
ASoC: cs53l30: Rename the volume controls for preamplifier
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 b97c4446817a88a3e5c85d6eed3e65693588c088 Mon Sep 17 00:00:00 2001
From: Nicolin Chen <nicoleotsuka@gmail.com>
Date: Tue, 31 May 2016 16:06:38 -0700
Subject: [PATCH] ASoC: cs53l30: Rename the volume controls for preamplifier
Volume controls should end with 'Volume', so this patch renames them for
ADC preamplifier.
Signed-off-by: Nicolin Chen <nicoleotsuka@gmail.com>
Acked-by: Paul Handrigan <Paul.Handrigan@cirrus.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
sound/soc/codecs/cs53l30.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sound/soc/codecs/cs53l30.c b/sound/soc/codecs/cs53l30.c
index 714e5799284f..9aff449e57af 100644
--- a/sound/soc/codecs/cs53l30.c
+++ b/sound/soc/codecs/cs53l30.c
@@ -331,10 +331,10 @@ static const struct snd_kcontrol_new cs53l30_snd_controls[] = {
SOC_SINGLE_TLV("ADC2 NG Boost Volume", CS53L30_ADC2_NG_CTL,
CS53L30_ADCx_NG_BOOST_SHIFT, 1, 0, adc_ng_boost_tlv),
- SOC_DOUBLE_R_TLV("ADC1 Pre Amp Gain", CS53L30_ADC1A_AFE_CTL,
+ SOC_DOUBLE_R_TLV("ADC1 Preamplifier Volume", CS53L30_ADC1A_AFE_CTL,
CS53L30_ADC1B_AFE_CTL, CS53L30_ADCxy_PREAMP_SHIFT,
2, 0, pga_preamp_tlv),
- SOC_DOUBLE_R_TLV("ADC2 Pre Amp Gain", CS53L30_ADC2A_AFE_CTL,
+ SOC_DOUBLE_R_TLV("ADC2 Preamplifier Volume", CS53L30_ADC2A_AFE_CTL,
CS53L30_ADC2B_AFE_CTL, CS53L30_ADCxy_PREAMP_SHIFT,
2, 0, pga_preamp_tlv),
--
2.8.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2016-06-02 10:18 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-05-31 23:06 [PATCH 1/2] ASoC: cs53l30: Rename the volume controls for preamplifier Nicolin Chen
2016-05-31 23:06 ` [PATCH 2/2] ASoC: cs53l30: Check return value of regcache_sync() Nicolin Chen
2016-06-01 1:28 ` Handrigan, Paul
2016-06-02 10:18 ` Applied "ASoC: cs53l30: Check return value of regcache_sync()" to the asoc tree Mark Brown
2016-06-01 1:27 ` [PATCH 1/2] ASoC: cs53l30: Rename the volume controls for preamplifier Handrigan, Paul
2016-06-02 10:18 ` Applied "ASoC: cs53l30: Rename the volume controls for preamplifier" to the asoc tree Mark Brown
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).