[alsa-devel] [PATCH] ASoC: bcm_2835: Simplify mono guard by returning error on mono

[Matt Flax]

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 at 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