[alsa-devel] [PATCH 3/6] ALSA: hda: intel-nhlt: remove useless OR operation

[Takashi Iwai]

On Fri, 19 Jul 2019 19:06:07 +0200,
Pierre-Louis Bossart wrote:
> 
> Each assignment is final so there's no point in doing an OR.
> 
> Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart at linux.intel.com>

Please fold into the patch 2.  There is no reason to split.


thanks,

Takashi

> ---
>  sound/hda/intel-nhlt.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/sound/hda/intel-nhlt.c b/sound/hda/intel-nhlt.c
> index b9d00c1b25d5..7ba871e470f2 100644
> --- a/sound/hda/intel-nhlt.c
> +++ b/sound/hda/intel-nhlt.c
> @@ -73,13 +73,13 @@ int intel_nhlt_get_dmic_geo(struct device *dev, struct nhlt_acpi_table *nhlt)
>  			switch (cfg->array_type) {
>  			case NHLT_MIC_ARRAY_2CH_SMALL:
>  			case NHLT_MIC_ARRAY_2CH_BIG:
> -				dmic_geo |= MIC_ARRAY_2CH;
> +				dmic_geo = MIC_ARRAY_2CH;
>  				break;
>  
>  			case NHLT_MIC_ARRAY_4CH_1ST_GEOM:
>  			case NHLT_MIC_ARRAY_4CH_L_SHAPED:
>  			case NHLT_MIC_ARRAY_4CH_2ND_GEOM:
> -				dmic_geo |= MIC_ARRAY_4CH;
> +				dmic_geo = MIC_ARRAY_4CH;
>  				break;
>  
>  			default:
> -- 
> 2.20.1
>