* [PATCH] ASoC: bcm_2835: Simplify mono guard by returning error on mono
@ 2017-03-08 10:58 Matt Flax
2017-03-08 11:13 ` Florian Kauer
2017-03-08 11:33 ` Matthias Reichl
0 siblings, 2 replies; 6+ messages in thread
From: Matt Flax @ 2017-03-08 10:58 UTC (permalink / raw)
To: linux-arm-kernel
This patch simplifies the bcm2835_i2s.c code when the driver returns
error on mono channel requests. It does this by testing for mono
instead of using a switch statement to test for stereo.
The bcm2835_i2s driver can only work in stereo mode. Whilst leaving
the driver entirel compliant with the I2S protocol, it simplifies the
code by removing a few redundant lines of code.
Signed-off-by: Matt Flax <flatmax@flatmax.org>
---
sound/soc/bcm/bcm2835-i2s.c | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/sound/soc/bcm/bcm2835-i2s.c b/sound/soc/bcm/bcm2835-i2s.c
index 6ba2049..1e6a1da 100644
--- a/sound/soc/bcm/bcm2835-i2s.c
+++ b/sound/soc/bcm/bcm2835-i2s.c
@@ -310,15 +310,16 @@ static int bcm2835_i2s_hw_params(struct snd_pcm_substream *substream,
ch1pos = data_delay;
ch2pos = bclk_ratio / 2 + data_delay;
- switch (params_channels(params)) {
- case 2:
- format = BCM2835_I2S_CH1(format) | BCM2835_I2S_CH2(format);
- format |= BCM2835_I2S_CH1(BCM2835_I2S_CHPOS(ch1pos));
- format |= BCM2835_I2S_CH2(BCM2835_I2S_CHPOS(ch2pos));
- break;
- default:
+ /* C
+ * Check we aren't setting channel 2 on a mono stream.
+ * We currently only support stereo
+ */
+ if (params_channels(params) == 1)
return -EINVAL;
- }
+
+ format = BCM2835_I2S_CH1(format) | BCM2835_I2S_CH2(format);
+ format |= BCM2835_I2S_CH1(BCM2835_I2S_CHPOS(ch1pos));
+ format |= BCM2835_I2S_CH2(BCM2835_I2S_CHPOS(ch2pos));
/*
* Set format for both streams.
--
2.7.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH] ASoC: bcm_2835: Simplify mono guard by returning error on mono
2017-03-08 10:58 [PATCH] ASoC: bcm_2835: Simplify mono guard by returning error on mono Matt Flax
@ 2017-03-08 11:13 ` Florian Kauer
2017-03-08 11:35 ` [alsa-devel] " Matt Flax
2017-03-08 11:33 ` Matthias Reichl
1 sibling, 1 reply; 6+ messages in thread
From: Florian Kauer @ 2017-03-08 11:13 UTC (permalink / raw)
To: linux-arm-kernel
I don't really see why it simplifies the code.
Actually, the number of lines is even increased by this patch.
And the logic will fail if ever params_channels would return something
larger than 2.
Greetings,
Florian
On 08.03.2017 11:58, Matt Flax wrote:
> This patch simplifies the bcm2835_i2s.c code when the driver returns
> error on mono channel requests. It does this by testing for mono
> instead of using a switch statement to test for stereo.
>
> The bcm2835_i2s driver can only work in stereo mode. Whilst leaving
> the driver entirel compliant with the I2S protocol, it simplifies the
> code by removing a few redundant lines of code.
>
> Signed-off-by: Matt Flax <flatmax@flatmax.org>
> ---
> sound/soc/bcm/bcm2835-i2s.c | 17 +++++++++--------
> 1 file changed, 9 insertions(+), 8 deletions(-)
>
> diff --git a/sound/soc/bcm/bcm2835-i2s.c b/sound/soc/bcm/bcm2835-i2s.c
> index 6ba2049..1e6a1da 100644
> --- a/sound/soc/bcm/bcm2835-i2s.c
> +++ b/sound/soc/bcm/bcm2835-i2s.c
> @@ -310,15 +310,16 @@ static int bcm2835_i2s_hw_params(struct snd_pcm_substream *substream,
> ch1pos = data_delay;
> ch2pos = bclk_ratio / 2 + data_delay;
>
> - switch (params_channels(params)) {
> - case 2:
> - format = BCM2835_I2S_CH1(format) | BCM2835_I2S_CH2(format);
> - format |= BCM2835_I2S_CH1(BCM2835_I2S_CHPOS(ch1pos));
> - format |= BCM2835_I2S_CH2(BCM2835_I2S_CHPOS(ch2pos));
> - break;
> - default:
> + /* C
> + * Check we aren't setting channel 2 on a mono stream.
> + * We currently only support stereo
> + */
> + if (params_channels(params) == 1)
> return -EINVAL;
> - }
> +
> + format = BCM2835_I2S_CH1(format) | BCM2835_I2S_CH2(format);
> + format |= BCM2835_I2S_CH1(BCM2835_I2S_CHPOS(ch1pos));
> + format |= BCM2835_I2S_CH2(BCM2835_I2S_CHPOS(ch2pos));
>
> /*
> * Set format for both streams.
>
^ permalink raw reply [flat|nested] 6+ messages in thread* [alsa-devel] [PATCH] ASoC: bcm_2835: Simplify mono guard by returning error on mono
2017-03-08 11:13 ` Florian Kauer
@ 2017-03-08 11:35 ` Matt Flax
0 siblings, 0 replies; 6+ messages in thread
From: Matt Flax @ 2017-03-08 11:35 UTC (permalink / raw)
To: linux-arm-kernel
On 08/03/17 22:13, Florian Kauer wrote:
> I don't really see why it simplifies the code.
> Actually, the number of lines is even increased by this patch.
> And the logic will fail if ever params_channels would return something
> larger than 2.
>
>
The actual lines of code (excluding comments has shrunk from 9 to 5) -
there is no point arguing that. The clock cycle count to execute the
same logic has been reduced.
The channel count can't be larger then 2 because channels_min =
channels_max = 2, check the bcm2835_i2s.c file.
If channel count is ever != 2 then someone is intentionally hacking -
that is beyond our control and in the interests of the hackers - good
luck to them.
This patch simplifies the code base and is entirely equivalent to the
code it is replacing.
This patch is still entirely I2S compliant.
Is anyone interested in reducing code complexity ?
Matt
>
> On 08.03.2017 11:58, Matt Flax wrote:
>> This patch simplifies the bcm2835_i2s.c code when the driver returns
>> error on mono channel requests. It does this by testing for mono
>> instead of using a switch statement to test for stereo.
>>
>> The bcm2835_i2s driver can only work in stereo mode. Whilst leaving
>> the driver entirel compliant with the I2S protocol, it simplifies the
>> code by removing a few redundant lines of code.
>>
>> Signed-off-by: Matt Flax <flatmax@flatmax.org>
>> ---
>> sound/soc/bcm/bcm2835-i2s.c | 17 +++++++++--------
>> 1 file changed, 9 insertions(+), 8 deletions(-)
>>
>> diff --git a/sound/soc/bcm/bcm2835-i2s.c b/sound/soc/bcm/bcm2835-i2s.c
>> index 6ba2049..1e6a1da 100644
>> --- a/sound/soc/bcm/bcm2835-i2s.c
>> +++ b/sound/soc/bcm/bcm2835-i2s.c
>> @@ -310,15 +310,16 @@ static int bcm2835_i2s_hw_params(struct
>> snd_pcm_substream *substream,
>> ch1pos = data_delay;
>> ch2pos = bclk_ratio / 2 + data_delay;
>>
>> - switch (params_channels(params)) {
>> - case 2:
>> - format = BCM2835_I2S_CH1(format) | BCM2835_I2S_CH2(format);
>> - format |= BCM2835_I2S_CH1(BCM2835_I2S_CHPOS(ch1pos));
>> - format |= BCM2835_I2S_CH2(BCM2835_I2S_CHPOS(ch2pos));
>> - break;
>> - default:
>> + /* C
>> + * Check we aren't setting channel 2 on a mono stream.
>> + * We currently only support stereo
>> + */
>> + if (params_channels(params) == 1)
>> return -EINVAL;
>> - }
>> +
>> + format = BCM2835_I2S_CH1(format) | BCM2835_I2S_CH2(format);
>> + format |= BCM2835_I2S_CH1(BCM2835_I2S_CHPOS(ch1pos));
>> + format |= BCM2835_I2S_CH2(BCM2835_I2S_CHPOS(ch2pos));
>>
>> /*
>> * Set format for both streams.
>>
> _______________________________________________
> Alsa-devel mailing list
> Alsa-devel at alsa-project.org
> http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] ASoC: bcm_2835: Simplify mono guard by returning error on mono
2017-03-08 10:58 [PATCH] ASoC: bcm_2835: Simplify mono guard by returning error on mono Matt Flax
2017-03-08 11:13 ` Florian Kauer
@ 2017-03-08 11:33 ` Matthias Reichl
2017-03-08 11:43 ` [alsa-devel] " Matt Flax
1 sibling, 1 reply; 6+ messages in thread
From: Matthias Reichl @ 2017-03-08 11:33 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Mar 08, 2017 at 09:58:54PM +1100, Matt Flax wrote:
> This patch simplifies the bcm2835_i2s.c code when the driver returns
> error on mono channel requests. It does this by testing for mono
> instead of using a switch statement to test for stereo.
>
> The bcm2835_i2s driver can only work in stereo mode. Whilst leaving
> the driver entirel compliant with the I2S protocol, it simplifies the
> code by removing a few redundant lines of code.
>
> Signed-off-by: Matt Flax <flatmax@flatmax.org>
I'm against this, it removes the semantics that I2S can only do 2
channels from the code part. Without looking at the rest of the code
one could get the impression that bcm2835-i2s could support all
layouts except 1 channel.
so long,
Hias
> ---
> sound/soc/bcm/bcm2835-i2s.c | 17 +++++++++--------
> 1 file changed, 9 insertions(+), 8 deletions(-)
>
> diff --git a/sound/soc/bcm/bcm2835-i2s.c b/sound/soc/bcm/bcm2835-i2s.c
> index 6ba2049..1e6a1da 100644
> --- a/sound/soc/bcm/bcm2835-i2s.c
> +++ b/sound/soc/bcm/bcm2835-i2s.c
> @@ -310,15 +310,16 @@ static int bcm2835_i2s_hw_params(struct snd_pcm_substream *substream,
> ch1pos = data_delay;
> ch2pos = bclk_ratio / 2 + data_delay;
>
> - switch (params_channels(params)) {
> - case 2:
> - format = BCM2835_I2S_CH1(format) | BCM2835_I2S_CH2(format);
> - format |= BCM2835_I2S_CH1(BCM2835_I2S_CHPOS(ch1pos));
> - format |= BCM2835_I2S_CH2(BCM2835_I2S_CHPOS(ch2pos));
> - break;
> - default:
> + /* C
> + * Check we aren't setting channel 2 on a mono stream.
> + * We currently only support stereo
> + */
> + if (params_channels(params) == 1)
> return -EINVAL;
> - }
> +
> + format = BCM2835_I2S_CH1(format) | BCM2835_I2S_CH2(format);
> + format |= BCM2835_I2S_CH1(BCM2835_I2S_CHPOS(ch1pos));
> + format |= BCM2835_I2S_CH2(BCM2835_I2S_CHPOS(ch2pos));
>
> /*
> * Set format for both streams.
> --
> 2.7.4
>
^ permalink raw reply [flat|nested] 6+ messages in thread* [alsa-devel] [PATCH] ASoC: bcm_2835: Simplify mono guard by returning error on mono
2017-03-08 11:33 ` Matthias Reichl
@ 2017-03-08 11:43 ` Matt Flax
2017-03-08 12:00 ` Matthias Reichl
0 siblings, 1 reply; 6+ messages in thread
From: Matt Flax @ 2017-03-08 11:43 UTC (permalink / raw)
To: linux-arm-kernel
On 08/03/17 22:33, Matthias Reichl wrote:
> On Wed, Mar 08, 2017 at 09:58:54PM +1100, Matt Flax wrote:
>> This patch simplifies the bcm2835_i2s.c code when the driver returns
>> error on mono channel requests. It does this by testing for mono
>> instead of using a switch statement to test for stereo.
>>
>> The bcm2835_i2s driver can only work in stereo mode. Whilst leaving
>> the driver entirel compliant with the I2S protocol, it simplifies the
>> code by removing a few redundant lines of code.
>>
>> Signed-off-by: Matt Flax <flatmax@flatmax.org>
> I'm against this, it removes the semantics that I2S can only do 2
> channels from the code part. Without looking at the rest of the code
> one could get the impression that bcm2835-i2s could support all
> layouts except 1 channel.
>
The comment clearly states :
/*
* Check we aren't setting channel 2 on a mono stream.
* We currently only support stereo
*/
How could anyone possibly think that it would support "all layouts
except 1 channel" ?
I have reduced the clock cycle count to implement the same logic in
code. I have clearly indicated that we ONLY support stereo channel counts.
In my opinion this code is simpler, easier to read and makes more sense.
thanks
Matt
>> ---
>> sound/soc/bcm/bcm2835-i2s.c | 17 +++++++++--------
>> 1 file changed, 9 insertions(+), 8 deletions(-)
>>
>> diff --git a/sound/soc/bcm/bcm2835-i2s.c b/sound/soc/bcm/bcm2835-i2s.c
>> index 6ba2049..1e6a1da 100644
>> --- a/sound/soc/bcm/bcm2835-i2s.c
>> +++ b/sound/soc/bcm/bcm2835-i2s.c
>> @@ -310,15 +310,16 @@ static int bcm2835_i2s_hw_params(struct snd_pcm_substream *substream,
>> ch1pos = data_delay;
>> ch2pos = bclk_ratio / 2 + data_delay;
>>
>> - switch (params_channels(params)) {
>> - case 2:
>> - format = BCM2835_I2S_CH1(format) | BCM2835_I2S_CH2(format);
>> - format |= BCM2835_I2S_CH1(BCM2835_I2S_CHPOS(ch1pos));
>> - format |= BCM2835_I2S_CH2(BCM2835_I2S_CHPOS(ch2pos));
>> - break;
>> - default:
>> + /* C
>> + * Check we aren't setting channel 2 on a mono stream.
>> + * We currently only support stereo
>> + */
>> + if (params_channels(params) == 1)
>> return -EINVAL;
>> - }
>> +
>> + format = BCM2835_I2S_CH1(format) | BCM2835_I2S_CH2(format);
>> + format |= BCM2835_I2S_CH1(BCM2835_I2S_CHPOS(ch1pos));
>> + format |= BCM2835_I2S_CH2(BCM2835_I2S_CHPOS(ch2pos));
>>
>> /*
>> * Set format for both streams.
>> --
>> 2.7.4
>>
> _______________________________________________
> Alsa-devel mailing list
> Alsa-devel at alsa-project.org
> http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
^ permalink raw reply [flat|nested] 6+ messages in thread* [alsa-devel] [PATCH] ASoC: bcm_2835: Simplify mono guard by returning error on mono
2017-03-08 11:43 ` [alsa-devel] " Matt Flax
@ 2017-03-08 12:00 ` Matthias Reichl
0 siblings, 0 replies; 6+ messages in thread
From: Matthias Reichl @ 2017-03-08 12:00 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Mar 08, 2017 at 10:43:19PM +1100, Matt Flax wrote:
>
>
> On 08/03/17 22:33, Matthias Reichl wrote:
> >On Wed, Mar 08, 2017 at 09:58:54PM +1100, Matt Flax wrote:
> >>This patch simplifies the bcm2835_i2s.c code when the driver returns
> >>error on mono channel requests. It does this by testing for mono
> >>instead of using a switch statement to test for stereo.
> >>
> >>The bcm2835_i2s driver can only work in stereo mode. Whilst leaving
> >>the driver entirel compliant with the I2S protocol, it simplifies the
> >>code by removing a few redundant lines of code.
> >>
> >>Signed-off-by: Matt Flax <flatmax@flatmax.org>
> >I'm against this, it removes the semantics that I2S can only do 2
> >channels from the code part. Without looking at the rest of the code
> >one could get the impression that bcm2835-i2s could support all
> >layouts except 1 channel.
> >
>
> The comment clearly states :
>
> /*
> * Check we aren't setting channel 2 on a mono stream.
> * We currently only support stereo
> */
>
> How could anyone possibly think that it would support "all layouts except 1
> channel" ?
>
> I have reduced the clock cycle count to implement the same logic in code. I
> have clearly indicated that we ONLY support stereo channel counts.
>
> In my opinion this code is simpler, easier to read and makes more sense.
In the current implementation this is obvious without looking into
comments.
It's also odd that you write "We currently only support stereo"
in the comments but then implement a "fail on channels == 1".
If you want to simplify the code and keep it readable you could
do it this way - this also preserves semantics of the code:
/* Only stereo is supported - but this is obvious and the comment can be removed */
if (params_channels(params) != 2)
return -EINVAL;
I don't see a pressing need to change to the current upstream
driver, the code is fine and readable as well.
so long,
Hias
>
> thanks
> Matt
>
>
> >>---
> >> sound/soc/bcm/bcm2835-i2s.c | 17 +++++++++--------
> >> 1 file changed, 9 insertions(+), 8 deletions(-)
> >>
> >>diff --git a/sound/soc/bcm/bcm2835-i2s.c b/sound/soc/bcm/bcm2835-i2s.c
> >>index 6ba2049..1e6a1da 100644
> >>--- a/sound/soc/bcm/bcm2835-i2s.c
> >>+++ b/sound/soc/bcm/bcm2835-i2s.c
> >>@@ -310,15 +310,16 @@ static int bcm2835_i2s_hw_params(struct snd_pcm_substream *substream,
> >> ch1pos = data_delay;
> >> ch2pos = bclk_ratio / 2 + data_delay;
> >>- switch (params_channels(params)) {
> >>- case 2:
> >>- format = BCM2835_I2S_CH1(format) | BCM2835_I2S_CH2(format);
> >>- format |= BCM2835_I2S_CH1(BCM2835_I2S_CHPOS(ch1pos));
> >>- format |= BCM2835_I2S_CH2(BCM2835_I2S_CHPOS(ch2pos));
> >>- break;
> >>- default:
> >>+ /* C
> >>+ * Check we aren't setting channel 2 on a mono stream.
> >>+ * We currently only support stereo
> >>+ */
> >>+ if (params_channels(params) == 1)
> >> return -EINVAL;
> >>- }
> >>+
> >>+ format = BCM2835_I2S_CH1(format) | BCM2835_I2S_CH2(format);
> >>+ format |= BCM2835_I2S_CH1(BCM2835_I2S_CHPOS(ch1pos));
> >>+ format |= BCM2835_I2S_CH2(BCM2835_I2S_CHPOS(ch2pos));
> >> /*
> >> * Set format for both streams.
> >>--
> >>2.7.4
> >>
> >_______________________________________________
> >Alsa-devel mailing list
> >Alsa-devel at alsa-project.org
> >http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2017-03-08 12:00 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-03-08 10:58 [PATCH] ASoC: bcm_2835: Simplify mono guard by returning error on mono Matt Flax
2017-03-08 11:13 ` Florian Kauer
2017-03-08 11:35 ` [alsa-devel] " Matt Flax
2017-03-08 11:33 ` Matthias Reichl
2017-03-08 11:43 ` [alsa-devel] " Matt Flax
2017-03-08 12:00 ` Matthias Reichl
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox