* [PATCH 2/8] ASoC: alc5632: Use params_width() rather than memory format
2014-01-08 19:51 [PATCH 1/8] ASoC: alc5623: Use params_width() rather than memory format Mark Brown
@ 2014-01-08 19:51 ` Mark Brown
2014-01-09 4:55 ` Leon Romanovsky
2014-01-08 19:51 ` [PATCH 3/8] ASoC: cs42l51: " Mark Brown
` (5 subsequent siblings)
6 siblings, 1 reply; 13+ messages in thread
From: Mark Brown @ 2014-01-08 19:51 UTC (permalink / raw)
To: Liam Girdwood; +Cc: alsa-devel, linaro-kernel, Mark Brown
From: Mark Brown <broonie@linaro.org>
Signed-off-by: Mark Brown <broonie@linaro.org>
---
sound/soc/codecs/alc5632.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/sound/soc/codecs/alc5632.c b/sound/soc/codecs/alc5632.c
index 19e9f222d09c..fb001c56cf8d 100644
--- a/sound/soc/codecs/alc5632.c
+++ b/sound/soc/codecs/alc5632.c
@@ -869,14 +869,14 @@ static int alc5632_pcm_hw_params(struct snd_pcm_substream *substream,
iface &= ~ALC5632_DAI_I2S_DL_MASK;
/* bit size */
- switch (params_format(params)) {
- case SNDRV_PCM_FORMAT_S16_LE:
+ switch (params_width(params)) {
+ case 16:
iface |= ALC5632_DAI_I2S_DL_16;
break;
- case SNDRV_PCM_FORMAT_S20_3LE:
+ case 20:
iface |= ALC5632_DAI_I2S_DL_20;
break;
- case SNDRV_PCM_FORMAT_S24_LE:
+ case 24:
iface |= ALC5632_DAI_I2S_DL_24;
break;
default:
--
1.8.5.2
^ permalink raw reply related [flat|nested] 13+ messages in thread* Re: [PATCH 2/8] ASoC: alc5632: Use params_width() rather than memory format
2014-01-08 19:51 ` [PATCH 2/8] ASoC: alc5632: " Mark Brown
@ 2014-01-09 4:55 ` Leon Romanovsky
2014-01-09 10:16 ` Lars-Peter Clausen
2014-01-09 10:33 ` Mark Brown
0 siblings, 2 replies; 13+ messages in thread
From: Leon Romanovsky @ 2014-01-09 4:55 UTC (permalink / raw)
To: Mark Brown
Cc: alsa-devel@alsa-project.org, linaro-kernel, Liam Girdwood,
Mark Brown
Hi Mark,
On Wed, Jan 8, 2014 at 9:51 PM, Mark Brown <broonie@kernel.org> wrote:
> From: Mark Brown <broonie@linaro.org>
>
> Signed-off-by: Mark Brown <broonie@linaro.org>
> ---
> sound/soc/codecs/alc5632.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/sound/soc/codecs/alc5632.c b/sound/soc/codecs/alc5632.c
> index 19e9f222d09c..fb001c56cf8d 100644
> --- a/sound/soc/codecs/alc5632.c
> +++ b/sound/soc/codecs/alc5632.c
> @@ -869,14 +869,14 @@ static int alc5632_pcm_hw_params(struct snd_pcm_substream *substream,
> iface &= ~ALC5632_DAI_I2S_DL_MASK;
>
> /* bit size */
> - switch (params_format(params)) {
> - case SNDRV_PCM_FORMAT_S16_LE:
> + switch (params_width(params)) {
> + case 16:
May be the better way will be to use define here and not hard coded value?
> iface |= ALC5632_DAI_I2S_DL_16;
> break;
> - case SNDRV_PCM_FORMAT_S20_3LE:
> + case 20:
> iface |= ALC5632_DAI_I2S_DL_20;
> break;
> - case SNDRV_PCM_FORMAT_S24_LE:
> + case 24:
> iface |= ALC5632_DAI_I2S_DL_24;
> break;
> default:
> --
> 1.8.5.2
>
> _______________________________________________
> Alsa-devel mailing list
> Alsa-devel@alsa-project.org
> http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
--
Leon Romanovsky | Independent Linux Consultant
www.leon.nu | leon@leon.nu
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [PATCH 2/8] ASoC: alc5632: Use params_width() rather than memory format
2014-01-09 4:55 ` Leon Romanovsky
@ 2014-01-09 10:16 ` Lars-Peter Clausen
2014-01-09 10:33 ` Mark Brown
1 sibling, 0 replies; 13+ messages in thread
From: Lars-Peter Clausen @ 2014-01-09 10:16 UTC (permalink / raw)
To: Leon Romanovsky
Cc: alsa-devel@alsa-project.org, Mark Brown, Liam Girdwood,
linaro-kernel, Mark Brown
On 01/09/2014 05:55 AM, Leon Romanovsky wrote:
> Hi Mark,
>
> On Wed, Jan 8, 2014 at 9:51 PM, Mark Brown <broonie@kernel.org> wrote:
>> From: Mark Brown <broonie@linaro.org>
>>
>> Signed-off-by: Mark Brown <broonie@linaro.org>
>> ---
>> sound/soc/codecs/alc5632.c | 8 ++++----
>> 1 file changed, 4 insertions(+), 4 deletions(-)
>>
>> diff --git a/sound/soc/codecs/alc5632.c b/sound/soc/codecs/alc5632.c
>> index 19e9f222d09c..fb001c56cf8d 100644
>> --- a/sound/soc/codecs/alc5632.c
>> +++ b/sound/soc/codecs/alc5632.c
>> @@ -869,14 +869,14 @@ static int alc5632_pcm_hw_params(struct snd_pcm_substream *substream,
>> iface &= ~ALC5632_DAI_I2S_DL_MASK;
>>
>> /* bit size */
>> - switch (params_format(params)) {
>> - case SNDRV_PCM_FORMAT_S16_LE:
>> + switch (params_width(params)) {
>> + case 16:
> May be the better way will be to use define here and not hard coded value?
like #define SIXTEEN 16? ;)
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [PATCH 2/8] ASoC: alc5632: Use params_width() rather than memory format
2014-01-09 4:55 ` Leon Romanovsky
2014-01-09 10:16 ` Lars-Peter Clausen
@ 2014-01-09 10:33 ` Mark Brown
2014-01-10 13:44 ` Leon Romanovsky
1 sibling, 1 reply; 13+ messages in thread
From: Mark Brown @ 2014-01-09 10:33 UTC (permalink / raw)
To: Leon Romanovsky; +Cc: alsa-devel@alsa-project.org, linaro-kernel, Liam Girdwood
[-- Attachment #1.1: Type: text/plain, Size: 327 bytes --]
On Thu, Jan 09, 2014 at 06:55:17AM +0200, Leon Romanovsky wrote:
> On Wed, Jan 8, 2014 at 9:51 PM, Mark Brown <broonie@kernel.org> wrote:
> > + switch (params_width(params)) {
> > + case 16:
> May be the better way will be to use define here and not hard coded value?
No, it really is actually a number of bits.
[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
[-- Attachment #2: Type: text/plain, Size: 0 bytes --]
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [PATCH 2/8] ASoC: alc5632: Use params_width() rather than memory format
2014-01-09 10:33 ` Mark Brown
@ 2014-01-10 13:44 ` Leon Romanovsky
2014-01-10 13:51 ` Takashi Iwai
0 siblings, 1 reply; 13+ messages in thread
From: Leon Romanovsky @ 2014-01-10 13:44 UTC (permalink / raw)
To: Mark Brown; +Cc: alsa-devel@alsa-project.org, linaro-kernel, Liam Girdwood
On Thu, Jan 9, 2014 at 12:33 PM, Mark Brown <broonie@kernel.org> wrote:
> On Thu, Jan 09, 2014 at 06:55:17AM +0200, Leon Romanovsky wrote:
>> On Wed, Jan 8, 2014 at 9:51 PM, Mark Brown <broonie@kernel.org> wrote:
>
>> > + switch (params_width(params)) {
>> > + case 16:
>
>> May be the better way will be to use define here and not hard coded value?
>
> No, it really is actually a number of bits.
Thanks, I didn't know about it.
In such case it is really unimportant to introduce define here.
--
Leon Romanovsky | Independent Linux Consultant
www.leon.nu | leon@leon.nu
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [PATCH 2/8] ASoC: alc5632: Use params_width() rather than memory format
2014-01-10 13:44 ` Leon Romanovsky
@ 2014-01-10 13:51 ` Takashi Iwai
0 siblings, 0 replies; 13+ messages in thread
From: Takashi Iwai @ 2014-01-10 13:51 UTC (permalink / raw)
To: Leon Romanovsky
Cc: alsa-devel@alsa-project.org, Mark Brown, Liam Girdwood,
linaro-kernel
At Fri, 10 Jan 2014 15:44:43 +0200,
Leon Romanovsky wrote:
>
> On Thu, Jan 9, 2014 at 12:33 PM, Mark Brown <broonie@kernel.org> wrote:
> > On Thu, Jan 09, 2014 at 06:55:17AM +0200, Leon Romanovsky wrote:
> >> On Wed, Jan 8, 2014 at 9:51 PM, Mark Brown <broonie@kernel.org> wrote:
> >
> >> > + switch (params_width(params)) {
> >> > + case 16:
> >
> >> May be the better way will be to use define here and not hard coded value?
> >
> > No, it really is actually a number of bits.
> Thanks, I didn't know about it.
> In such case it is really unimportant to introduce define here.
But, it's typo-prone :)
OTOH, the numbers about format bits are small, so it's usually easier
to audit, and not to worry too much. But large numbers like sample
rates are often mistyped, thus using defined constants may have more
merits.
Takashi
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 3/8] ASoC: cs42l51: Use params_width() rather than memory format
2014-01-08 19:51 [PATCH 1/8] ASoC: alc5623: Use params_width() rather than memory format Mark Brown
2014-01-08 19:51 ` [PATCH 2/8] ASoC: alc5632: " Mark Brown
@ 2014-01-08 19:51 ` Mark Brown
2014-01-08 19:51 ` [PATCH 4/8] ASoC: da7210: " Mark Brown
` (4 subsequent siblings)
6 siblings, 0 replies; 13+ messages in thread
From: Mark Brown @ 2014-01-08 19:51 UTC (permalink / raw)
To: Liam Girdwood; +Cc: alsa-devel, linaro-kernel, Mark Brown
From: Mark Brown <broonie@linaro.org>
Signed-off-by: Mark Brown <broonie@linaro.org>
---
sound/soc/codecs/cs42l51.c | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/sound/soc/codecs/cs42l51.c b/sound/soc/codecs/cs42l51.c
index 1e0fa3b5f79a..6e9ea8379a91 100644
--- a/sound/soc/codecs/cs42l51.c
+++ b/sound/soc/codecs/cs42l51.c
@@ -423,21 +423,17 @@ static int cs42l51_hw_params(struct snd_pcm_substream *substream,
intf_ctl |= CS42L51_INTF_CTL_DAC_FORMAT(CS42L51_DAC_DIF_LJ24);
break;
case SND_SOC_DAIFMT_RIGHT_J:
- switch (params_format(params)) {
- case SNDRV_PCM_FORMAT_S16_LE:
- case SNDRV_PCM_FORMAT_S16_BE:
+ switch (params_width(params)) {
+ case 16:
fmt = CS42L51_DAC_DIF_RJ16;
break;
- case SNDRV_PCM_FORMAT_S18_3LE:
- case SNDRV_PCM_FORMAT_S18_3BE:
+ case 18:
fmt = CS42L51_DAC_DIF_RJ18;
break;
- case SNDRV_PCM_FORMAT_S20_3LE:
- case SNDRV_PCM_FORMAT_S20_3BE:
+ case 20:
fmt = CS42L51_DAC_DIF_RJ20;
break;
- case SNDRV_PCM_FORMAT_S24_LE:
- case SNDRV_PCM_FORMAT_S24_BE:
+ case 24:
fmt = CS42L51_DAC_DIF_RJ24;
break;
default:
--
1.8.5.2
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 4/8] ASoC: da7210: Use params_width() rather than memory format
2014-01-08 19:51 [PATCH 1/8] ASoC: alc5623: Use params_width() rather than memory format Mark Brown
2014-01-08 19:51 ` [PATCH 2/8] ASoC: alc5632: " Mark Brown
2014-01-08 19:51 ` [PATCH 3/8] ASoC: cs42l51: " Mark Brown
@ 2014-01-08 19:51 ` Mark Brown
2014-01-08 19:52 ` [PATCH 5/8] ASoC: da7213: " Mark Brown
` (3 subsequent siblings)
6 siblings, 0 replies; 13+ messages in thread
From: Mark Brown @ 2014-01-08 19:51 UTC (permalink / raw)
To: Liam Girdwood; +Cc: alsa-devel, linaro-kernel, Mark Brown
From: Mark Brown <broonie@linaro.org>
Signed-off-by: Mark Brown <broonie@linaro.org>
---
sound/soc/codecs/da7210.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/sound/soc/codecs/da7210.c b/sound/soc/codecs/da7210.c
index 8166dcb2e4a3..e62e294a8033 100644
--- a/sound/soc/codecs/da7210.c
+++ b/sound/soc/codecs/da7210.c
@@ -778,17 +778,17 @@ static int da7210_hw_params(struct snd_pcm_substream *substream,
dai_cfg1 = 0xFC & snd_soc_read(codec, DA7210_DAI_CFG1);
- switch (params_format(params)) {
- case SNDRV_PCM_FORMAT_S16_LE:
+ switch (params_width(params)) {
+ case 16:
dai_cfg1 |= DA7210_DAI_WORD_S16_LE;
break;
- case SNDRV_PCM_FORMAT_S20_3LE:
+ case 20:
dai_cfg1 |= DA7210_DAI_WORD_S20_3LE;
break;
- case SNDRV_PCM_FORMAT_S24_LE:
+ case 24:
dai_cfg1 |= DA7210_DAI_WORD_S24_LE;
break;
- case SNDRV_PCM_FORMAT_S32_LE:
+ case 32:
dai_cfg1 |= DA7210_DAI_WORD_S32_LE;
break;
default:
--
1.8.5.2
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 5/8] ASoC: da7213: Use params_width() rather than memory format
2014-01-08 19:51 [PATCH 1/8] ASoC: alc5623: Use params_width() rather than memory format Mark Brown
` (2 preceding siblings ...)
2014-01-08 19:51 ` [PATCH 4/8] ASoC: da7210: " Mark Brown
@ 2014-01-08 19:52 ` Mark Brown
2014-01-08 19:52 ` [PATCH 6/8] ASoC: da732x: " Mark Brown
` (2 subsequent siblings)
6 siblings, 0 replies; 13+ messages in thread
From: Mark Brown @ 2014-01-08 19:52 UTC (permalink / raw)
To: Liam Girdwood; +Cc: alsa-devel, linaro-kernel, Mark Brown
From: Mark Brown <broonie@linaro.org>
Signed-off-by: Mark Brown <broonie@linaro.org>
---
sound/soc/codecs/da7213.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/sound/soc/codecs/da7213.c b/sound/soc/codecs/da7213.c
index 4a6f1daf911f..0c77e7ad7423 100644
--- a/sound/soc/codecs/da7213.c
+++ b/sound/soc/codecs/da7213.c
@@ -1067,17 +1067,17 @@ static int da7213_hw_params(struct snd_pcm_substream *substream,
u8 fs;
/* Set DAI format */
- switch (params_format(params)) {
- case SNDRV_PCM_FORMAT_S16_LE:
+ switch (params_width(params)) {
+ case 16:
dai_ctrl |= DA7213_DAI_WORD_LENGTH_S16_LE;
break;
- case SNDRV_PCM_FORMAT_S20_3LE:
+ case 20:
dai_ctrl |= DA7213_DAI_WORD_LENGTH_S20_LE;
break;
- case SNDRV_PCM_FORMAT_S24_LE:
+ case 24:
dai_ctrl |= DA7213_DAI_WORD_LENGTH_S24_LE;
break;
- case SNDRV_PCM_FORMAT_S32_LE:
+ case 32:
dai_ctrl |= DA7213_DAI_WORD_LENGTH_S32_LE;
break;
default:
--
1.8.5.2
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 6/8] ASoC: da732x: Use params_width() rather than memory format
2014-01-08 19:51 [PATCH 1/8] ASoC: alc5623: Use params_width() rather than memory format Mark Brown
` (3 preceding siblings ...)
2014-01-08 19:52 ` [PATCH 5/8] ASoC: da7213: " Mark Brown
@ 2014-01-08 19:52 ` Mark Brown
2014-01-08 19:52 ` [PATCH 7/8] ASoC: da9055: " Mark Brown
2014-01-08 19:52 ` [PATCH 8/8] ASoC: isabelle: " Mark Brown
6 siblings, 0 replies; 13+ messages in thread
From: Mark Brown @ 2014-01-08 19:52 UTC (permalink / raw)
To: Liam Girdwood; +Cc: alsa-devel, linaro-kernel, Mark Brown
From: Mark Brown <broonie@linaro.org>
Signed-off-by: Mark Brown <broonie@linaro.org>
---
sound/soc/codecs/da732x.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/sound/soc/codecs/da732x.c b/sound/soc/codecs/da732x.c
index dc0284dc9e6f..f295b6569910 100644
--- a/sound/soc/codecs/da732x.c
+++ b/sound/soc/codecs/da732x.c
@@ -973,17 +973,17 @@ static int da732x_hw_params(struct snd_pcm_substream *substream,
reg_aif = dai->driver->base;
- switch (params_format(params)) {
- case SNDRV_PCM_FORMAT_S16_LE:
+ switch (params_width(params)) {
+ case 16:
aif |= DA732X_AIF_WORD_16;
break;
- case SNDRV_PCM_FORMAT_S20_3LE:
+ case 20:
aif |= DA732X_AIF_WORD_20;
break;
- case SNDRV_PCM_FORMAT_S24_LE:
+ case 24:
aif |= DA732X_AIF_WORD_24;
break;
- case SNDRV_PCM_FORMAT_S32_LE:
+ case 32:
aif |= DA732X_AIF_WORD_32;
break;
default:
--
1.8.5.2
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 7/8] ASoC: da9055: Use params_width() rather than memory format
2014-01-08 19:51 [PATCH 1/8] ASoC: alc5623: Use params_width() rather than memory format Mark Brown
` (4 preceding siblings ...)
2014-01-08 19:52 ` [PATCH 6/8] ASoC: da732x: " Mark Brown
@ 2014-01-08 19:52 ` Mark Brown
2014-01-08 19:52 ` [PATCH 8/8] ASoC: isabelle: " Mark Brown
6 siblings, 0 replies; 13+ messages in thread
From: Mark Brown @ 2014-01-08 19:52 UTC (permalink / raw)
To: Liam Girdwood; +Cc: alsa-devel, linaro-kernel, Mark Brown
From: Mark Brown <broonie@linaro.org>
Signed-off-by: Mark Brown <broonie@linaro.org>
---
sound/soc/codecs/da9055.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/sound/soc/codecs/da9055.c b/sound/soc/codecs/da9055.c
index fc9802d1281d..52b79a487ac7 100644
--- a/sound/soc/codecs/da9055.c
+++ b/sound/soc/codecs/da9055.c
@@ -1058,17 +1058,17 @@ static int da9055_hw_params(struct snd_pcm_substream *substream,
u8 aif_ctrl, fs;
u32 sysclk;
- switch (params_format(params)) {
- case SNDRV_PCM_FORMAT_S16_LE:
+ switch (params_width(params)) {
+ case 16:
aif_ctrl = DA9055_AIF_WORD_S16_LE;
break;
- case SNDRV_PCM_FORMAT_S20_3LE:
+ case 20:
aif_ctrl = DA9055_AIF_WORD_S20_3LE;
break;
- case SNDRV_PCM_FORMAT_S24_LE:
+ case 24:
aif_ctrl = DA9055_AIF_WORD_S24_LE;
break;
- case SNDRV_PCM_FORMAT_S32_LE:
+ case 32:
aif_ctrl = DA9055_AIF_WORD_S32_LE;
break;
default:
--
1.8.5.2
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 8/8] ASoC: isabelle: Use params_width() rather than memory format
2014-01-08 19:51 [PATCH 1/8] ASoC: alc5623: Use params_width() rather than memory format Mark Brown
` (5 preceding siblings ...)
2014-01-08 19:52 ` [PATCH 7/8] ASoC: da9055: " Mark Brown
@ 2014-01-08 19:52 ` Mark Brown
6 siblings, 0 replies; 13+ messages in thread
From: Mark Brown @ 2014-01-08 19:52 UTC (permalink / raw)
To: Liam Girdwood; +Cc: alsa-devel, linaro-kernel, Mark Brown
From: Mark Brown <broonie@linaro.org>
Signed-off-by: Mark Brown <broonie@linaro.org>
---
sound/soc/codecs/isabelle.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/sound/soc/codecs/isabelle.c b/sound/soc/codecs/isabelle.c
index 53b455b8c07a..5839048ec467 100644
--- a/sound/soc/codecs/isabelle.c
+++ b/sound/soc/codecs/isabelle.c
@@ -951,11 +951,11 @@ static int isabelle_hw_params(struct snd_pcm_substream *substream,
ISABELLE_FS_RATE_MASK, fs_val);
/* bit size */
- switch (params_format(params)) {
- case SNDRV_PCM_FORMAT_S20_3LE:
+ switch (params_width(params)) {
+ case 20:
aif |= ISABELLE_AIF_LENGTH_20;
break;
- case SNDRV_PCM_FORMAT_S32_LE:
+ case 32:
aif |= ISABELLE_AIF_LENGTH_32;
break;
default:
--
1.8.5.2
^ permalink raw reply related [flat|nested] 13+ messages in thread