Alsa-Devel Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Eldad Zack <eldad@fogrefinery.com>
To: Takashi Iwai <tiwai@suse.de>, Jaroslav Kysela <perex@perex.cz>,
	Daniel Mack <zonque@gmail.com>,
	Clemens Ladisch <clemens@ladisch.de>
Cc: alsa-devel@alsa-project.org, Eldad Zack <eldad@fogrefinery.com>
Subject: [PATCH, for-next] ALSA: usb-audio: use FMTBITs in parse_audio_format_i
Date: Mon, 22 Apr 2013 01:44:04 +0200	[thread overview]
Message-ID: <1366587844-1252-1-git-send-email-eldad@fogrefinery.com> (raw)

Replace the usage of SNDRV_PCM_FORMAT_* macros with the equivalent
SNDRV_PCM_FMTBIT_* macros, and the result be can assigned directly
to the formats field.
Modify the variable name to reflect the change.

The following sparse messages are silenced:

sound/usb/format.c:377:44: warning: incorrect type in assignment (different base types)
sound/usb/format.c:377:44:    expected int [signed] pcm_format
sound/usb/format.c:377:44:    got restricted snd_pcm_format_t [usertype] <noident>
sound/usb/format.c:379:44: warning: incorrect type in assignment (different base types)
sound/usb/format.c:379:44:    expected int [signed] pcm_format
sound/usb/format.c:379:44:    got restricted snd_pcm_format_t [usertype] <noident>
sound/usb/format.c:382:36: warning: incorrect type in assignment (different base types)
sound/usb/format.c:382:36:    expected int [signed] pcm_format
sound/usb/format.c:382:36:    got restricted snd_pcm_format_t [usertype] <noident>

Signed-off-by: Eldad Zack <eldad@fogrefinery.com>
---
 sound/usb/format.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/sound/usb/format.c b/sound/usb/format.c
index 020ede0..e025e28 100644
--- a/sound/usb/format.c
+++ b/sound/usb/format.c
@@ -365,7 +365,7 @@ static int parse_audio_format_i(struct snd_usb_audio *chip,
 {
 	struct usb_interface_descriptor *altsd = get_iface_desc(iface);
 	int protocol = altsd->bInterfaceProtocol;
-	int pcm_format, ret;
+	int pcm_formats, ret;
 
 	if (fmt->bFormatType == UAC_FORMAT_TYPE_III) {
 		/* FIXME: the format type is really IECxxx
@@ -377,14 +377,14 @@ static int parse_audio_format_i(struct snd_usb_audio *chip,
 		case USB_ID(0x0763, 0x2003): /* M-Audio Audiophile USB */
 			if (chip->setup == 0x00 && 
 			    fp->altsetting == 6)
-				pcm_format = SNDRV_PCM_FORMAT_S16_BE;
+				pcm_formats = SNDRV_PCM_FMTBIT_S16_BE;
 			else
-				pcm_format = SNDRV_PCM_FORMAT_S16_LE;
+				pcm_formats = SNDRV_PCM_FMTBIT_S16_LE;
 			break;
 		default:
-			pcm_format = SNDRV_PCM_FORMAT_S16_LE;
+			pcm_formats = SNDRV_PCM_FMTBIT_S16_LE;
 		}
-		fp->formats = 1uLL << pcm_format;
+		fp->formats = pcm_formats;
 	} else {
 		fp->formats = parse_audio_format_i_type(chip, fp, format,
 							fmt, protocol);
-- 
1.8.1.5

             reply	other threads:[~2013-04-21 23:44 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-04-21 23:44 Eldad Zack [this message]
2013-04-22  8:51 ` [PATCH, for-next] ALSA: usb-audio: use FMTBITs in parse_audio_format_i Takashi Iwai
2013-04-22 11:29   ` Eldad Zack
2013-04-22 11:34     ` Takashi Iwai
2013-04-22 11:47       ` Eldad Zack
2013-04-22 11:49         ` Takashi Iwai
2013-04-22 23:00           ` [PATCH, for-next 1/2] ALSA: pcm_format_to_bits strong-typed conversion Eldad Zack
2013-04-22 23:00             ` [PATCH, for-next 2/2] ALSA: asihpi: add format support check in snd_card_asihpi_capture_formats Eldad Zack

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1366587844-1252-1-git-send-email-eldad@fogrefinery.com \
    --to=eldad@fogrefinery.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=clemens@ladisch.de \
    --cc=perex@perex.cz \
    --cc=tiwai@suse.de \
    --cc=zonque@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox