Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1410671 > unrolled thread

[PATCH 1/2] ASoC: cs53l30: Rename the volume controls for preamplifier

Started byNicolin Chen <nicoleotsuka@gmail.com>
First post2016-06-01 01:10 +0200
Last post2016-06-02 12:20 +0200
Articles 6 — 3 participants

Back to article view | Back to linux.kernel

Contents

  [PATCH 1/2] ASoC: cs53l30: Rename the volume controls for preamplifier Nicolin Chen <nicoleotsuka@gmail.com> - 2016-06-01 01:10 +0200
    [PATCH 2/2] ASoC: cs53l30: Check return value of regcache_sync() Nicolin Chen <nicoleotsuka@gmail.com> - 2016-06-01 01:10 +0200
      Re: [PATCH 2/2] ASoC: cs53l30: Check return value of regcache_sync() "Handrigan, Paul" <Paul.Handrigan@cirrus.com> - 2016-06-01 03:30 +0200
      Applied "ASoC: cs53l30: Check return value of regcache_sync()" to the asoc tree Mark Brown <broonie@kernel.org> - 2016-06-02 12:20 +0200
    Re: [PATCH 1/2] ASoC: cs53l30: Rename the volume controls for  preamplifier "Handrigan, Paul" <Paul.Handrigan@cirrus.com> - 2016-06-01 03:30 +0200
    Applied "ASoC: cs53l30: Rename the volume controls for preamplifier" to the asoc tree Mark Brown <broonie@kernel.org> - 2016-06-02 12:20 +0200

#1410671 — [PATCH 1/2] ASoC: cs53l30: Rename the volume controls for preamplifier

FromNicolin Chen <nicoleotsuka@gmail.com>
Date2016-06-01 01:10 +0200
Subject[PATCH 1/2] ASoC: cs53l30: Rename the volume controls for preamplifier
Message-ID<rF0Xn-s6-3@gated-at.bofh.it>
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

[toc] | [next] | [standalone]

#1410674 — [PATCH 2/2] ASoC: cs53l30: Check return value of regcache_sync()

FromNicolin Chen <nicoleotsuka@gmail.com>
Date2016-06-01 01:10 +0200
Subject[PATCH 2/2] ASoC: cs53l30: Check return value of regcache_sync()
Message-ID<rF0Xn-s6-9@gated-at.bofh.it>
In reply to#1410671
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

[toc] | [prev] | [next] | [standalone]

#1410724 — Re: [PATCH 2/2] ASoC: cs53l30: Check return value of regcache_sync()

From"Handrigan, Paul" <Paul.Handrigan@cirrus.com>
Date2016-06-01 03:30 +0200
SubjectRe: [PATCH 2/2] ASoC: cs53l30: Check return value of regcache_sync()
Message-ID<rF38R-1Jh-5@gated-at.bofh.it>
In reply to#1410674

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>

[toc] | [prev] | [next] | [standalone]

#1412097 — Applied "ASoC: cs53l30: Check return value of regcache_sync()" to the asoc tree

FromMark Brown <broonie@kernel.org>
Date2016-06-02 12:20 +0200
SubjectApplied "ASoC: cs53l30: Check return value of regcache_sync()" to the asoc tree
Message-ID<rFxTj-4Ge-3@gated-at.bofh.it>
In reply to#1410674
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

[toc] | [prev] | [next] | [standalone]

#1410722 — Re: [PATCH 1/2] ASoC: cs53l30: Rename the volume controls for preamplifier

From"Handrigan, Paul" <Paul.Handrigan@cirrus.com>
Date2016-06-01 03:30 +0200
SubjectRe: [PATCH 1/2] ASoC: cs53l30: Rename the volume controls for preamplifier
Message-ID<rF38S-1Jh-7@gated-at.bofh.it>
In reply to#1410671

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>

[toc] | [prev] | [next] | [standalone]

#1412095 — Applied "ASoC: cs53l30: Rename the volume controls for preamplifier" to the asoc tree

FromMark Brown <broonie@kernel.org>
Date2016-06-02 12:20 +0200
SubjectApplied "ASoC: cs53l30: Rename the volume controls for preamplifier" to the asoc tree
Message-ID<rFxTj-4Ge-1@gated-at.bofh.it>
In reply to#1410671
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

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web