Re: [Outreachy kernel] [PATCH v2 1/2] staging: bcm2835-audio: merge two if conditions into one

[Greg Kroah-Hartman <gregkh@linuxfoundation.org>]

On Tue, Mar 07, 2017 at 01:27:09AM +0530, Aishwarya Pant wrote:
> Patch merges two if conditions doing the same work into one.
> 
> Signed-off-by: Aishwarya Pant <aishpant@gmail.com>
> ---
>  drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c
> index d60d702..f4ce4801dc 100644
> --- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c
> +++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c
> @@ -122,10 +122,8 @@ static int snd_bcm2835_playback_open_generic(
>  	audio_info("Alsa open (%d)\n", substream->number);
>  	idx = substream->number;
>  
> -	if (spdif && chip->opened) {
> -		err = -EBUSY;
> -		goto out;
> -	} else if (!spdif && (chip->opened & (1 << idx))) {
> +	if ((spdif && chip->opened) ||
> +	    (!spdif && (chip->opened & (1 << idx)))) {

But now it's a lot harder to read and understand, right?  Please keep
the original, it's not incorrect.

There are _so_ many real things to fix in this driver, don't make minor
tweaks for no reason.

thanks,

greg k-h