Re: [PATCH 10/10] ALSA: xen: Use standard pcm_format_to_bits() for ALSA format bits

Re: [PATCH 10/10] ALSA: xen: Use standard pcm_format_to_bits() for ALSA format bits

[Oleksandr Andrushchenko]

Hello, Takashi!
> Date: Wed, 25 Jul 2018 23:19:45 +0200
> From: Takashi Iwai <tiwai@suse.de>
> To: alsa-devel@alsa-project.org
> Subject: [alsa-devel] [PATCH 10/10] ALSA: xen: Use standard
> 	pcm_format_to_bits() for ALSA format bits
> Message-ID: <20180725211945.19222-11-tiwai@suse.de>
>
> The open codes with the bit shift in xen_snd_front_alsa.c give sparse
> warnings as the PCM format type is with __bitwise.
> There is already a standard macro to get the format bits, so let's use
> it instead.
>
> This fixes sparse warnings like:
>    sound/xen/xen_snd_front_alsa.c:191:47: warning: restricted snd_pcm_format_t degrades to integer
>
> Signed-off-by: Takashi Iwai <tiwai@suse.de>
> ---
>   sound/xen/xen_snd_front_alsa.c | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/sound/xen/xen_snd_front_alsa.c b/sound/xen/xen_snd_front_alsa.c
> index 5a2bd70a2fa1..129180e17db1 100644
> --- a/sound/xen/xen_snd_front_alsa.c
> +++ b/sound/xen/xen_snd_front_alsa.c
> @@ -188,7 +188,7 @@ static u64 to_sndif_formats_mask(u64 alsa_formats)
>   
>   	mask = 0;
>   	for (i = 0; i < ARRAY_SIZE(ALSA_SNDIF_FORMATS); i++)
> -		if (1 << ALSA_SNDIF_FORMATS[i].alsa & alsa_formats)
> +		if (pcm_format_to_bits(ALSA_SNDIF_FORMATS[i].alsa) & alsa_formats)
>   			mask |= 1 << ALSA_SNDIF_FORMATS[i].sndif;
>   
>   	return mask;
> @@ -202,7 +202,7 @@ static u64 to_alsa_formats_mask(u64 sndif_formats)
>   	mask = 0;
>   	for (i = 0; i < ARRAY_SIZE(ALSA_SNDIF_FORMATS); i++)
>   		if (1 << ALSA_SNDIF_FORMATS[i].sndif & sndif_formats)
> -			mask |= 1 << ALSA_SNDIF_FORMATS[i].alsa;
> +			mask |= pcm_format_to_bits(ALSA_SNDIF_FORMATS[i].alsa);
>   
>   	return mask;
>   }
Thank you for your patch,
Reviewed-by: Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com>

Thank you,
Oleksandr

[PATCH 00/10] ALSA: yet more PCM format type conversion fixes

[Takashi Iwai]

Hi,

this is a series of similar fixes as the previous patchset for ASoC,
covering other ALSA drivers to deal with PCM format type properly.


Takashi

===

Takashi Iwai (10):
  ALSA: hda: Fix implicit PCM format type conversion
  ALSA: riptide: Fix PCM format type conversion
  ALSA: pcm: Fix sparse warning wrt PCM format type
  ALSA: ad1816a: Fix sparse warning wrt PCM format type
  ALSA: au88x0: Fix sparse warning wrt PCM format type
  ALSA: asihpi: Fix PCM format notations
  ALSA: wss: Fix sparse warning wrt PCM format type
  ALSA: sb: Fix PCM format bit calculation
  ALSA: sb: Fix sparse warning wrt PCM format type
  ALSA: xen: Use standard pcm_format_to_bits() for ALSA format bits

 include/sound/hdaudio.h         |  3 ++-
 include/sound/sb16_csp.h        |  2 +-
 sound/core/oss/pcm_oss.c        |  2 +-
 sound/hda/hdac_device.c         |  2 +-
 sound/isa/ad1816a/ad1816a_lib.c |  3 ++-
 sound/isa/sb/sb16_csp.c         |  6 +++---
 sound/isa/sb/sb16_main.c        |  9 ++++++---
 sound/isa/wss/wss_lib.c         |  2 +-
 sound/pci/asihpi/asihpi.c       | 24 +++++++++++++-----------
 sound/pci/au88x0/au88x0.h       |  2 +-
 sound/pci/au88x0/au88x0_core.c  |  2 +-
 sound/pci/riptide/riptide.c     |  2 +-
 sound/xen/xen_snd_front_alsa.c  |  4 ++--
 13 files changed, 35 insertions(+), 28 deletions(-)

-- 
2.18.0

[PATCH 10/10] ALSA: xen: Use standard pcm_format_to_bits() for ALSA format bits

[Takashi Iwai]

The open codes with the bit shift in xen_snd_front_alsa.c give sparse
warnings as the PCM format type is with __bitwise.
There is already a standard macro to get the format bits, so let's use
it instead.

This fixes sparse warnings like:
  sound/xen/xen_snd_front_alsa.c:191:47: warning: restricted snd_pcm_format_t degrades to integer

Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
 sound/xen/xen_snd_front_alsa.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sound/xen/xen_snd_front_alsa.c b/sound/xen/xen_snd_front_alsa.c
index 5a2bd70a2fa1..129180e17db1 100644
--- a/sound/xen/xen_snd_front_alsa.c
+++ b/sound/xen/xen_snd_front_alsa.c
@@ -188,7 +188,7 @@ static u64 to_sndif_formats_mask(u64 alsa_formats)
 
 	mask = 0;
 	for (i = 0; i < ARRAY_SIZE(ALSA_SNDIF_FORMATS); i++)
-		if (1 << ALSA_SNDIF_FORMATS[i].alsa & alsa_formats)
+		if (pcm_format_to_bits(ALSA_SNDIF_FORMATS[i].alsa) & alsa_formats)
 			mask |= 1 << ALSA_SNDIF_FORMATS[i].sndif;
 
 	return mask;
@@ -202,7 +202,7 @@ static u64 to_alsa_formats_mask(u64 sndif_formats)
 	mask = 0;
 	for (i = 0; i < ARRAY_SIZE(ALSA_SNDIF_FORMATS); i++)
 		if (1 << ALSA_SNDIF_FORMATS[i].sndif & sndif_formats)
-			mask |= 1 << ALSA_SNDIF_FORMATS[i].alsa;
+			mask |= pcm_format_to_bits(ALSA_SNDIF_FORMATS[i].alsa);
 
 	return mask;
 }
-- 
2.18.0