diff options
| author | Eldad Zack <eldad@fogrefinery.com> | 2013-04-03 23:18:53 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-04-04 08:30:49 +0200 |
| commit | f6a8bc70f85fdc49c5a3eca687c6018ffee8f050 (patch) | |
| tree | ae73558b4fde7bfa7b9cfe02a6c895de1a64cd1d /sound/usb/clock.c | |
| parent | 98ae472b574647e36b2c8306091dff6de4606222 (diff) | |
| download | linux-stable-f6a8bc70f85fdc49c5a3eca687c6018ffee8f050.tar.gz linux-stable-f6a8bc70f85fdc49c5a3eca687c6018ffee8f050.tar.bz2 linux-stable-f6a8bc70f85fdc49c5a3eca687c6018ffee8f050.zip | |
ALSA: usb-audio: use endianness macros
Replace the endianness conversions with the kernel-wide swabbing macros
in get/set_sample_rate_v2.
Signed-off-by: Eldad Zack <eldad@fogrefinery.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/usb/clock.c')
| -rw-r--r-- | sound/usb/clock.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/sound/usb/clock.c b/sound/usb/clock.c index e3ccf3d81075..013b346f045d 100644 --- a/sound/usb/clock.c +++ b/sound/usb/clock.c @@ -251,21 +251,21 @@ static int get_sample_rate_v2(struct snd_usb_audio *chip, int iface, int altsetting, int clock) { struct usb_device *dev = chip->dev; - unsigned char data[4]; + __le32 data; int err; err = snd_usb_ctl_msg(dev, usb_rcvctrlpipe(dev, 0), UAC2_CS_CUR, USB_TYPE_CLASS | USB_RECIP_INTERFACE | USB_DIR_IN, UAC2_CS_CONTROL_SAM_FREQ << 8, snd_usb_ctrl_intf(chip) | (clock << 8), - data, sizeof(data)); + &data, sizeof(data)); if (err < 0) { snd_printk(KERN_WARNING "%d:%d:%d: cannot get freq (v2)\n", dev->devnum, iface, altsetting); return 0; } - return data[0] | (data[1] << 8) | (data[2] << 16) | (data[3] << 24); + return le32_to_cpu(data); } static int set_sample_rate_v2(struct snd_usb_audio *chip, int iface, @@ -273,7 +273,7 @@ static int set_sample_rate_v2(struct snd_usb_audio *chip, int iface, struct audioformat *fmt, int rate) { struct usb_device *dev = chip->dev; - unsigned char data[4]; + __le32 data; int err, cur_rate, prev_rate; int clock = snd_usb_clock_find_source(chip, fmt->clock); @@ -289,15 +289,12 @@ static int set_sample_rate_v2(struct snd_usb_audio *chip, int iface, prev_rate = get_sample_rate_v2(chip, iface, fmt->altsetting, clock); - data[0] = rate; - data[1] = rate >> 8; - data[2] = rate >> 16; - data[3] = rate >> 24; + data = cpu_to_le32(rate); if ((err = snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev, 0), UAC2_CS_CUR, USB_TYPE_CLASS | USB_RECIP_INTERFACE | USB_DIR_OUT, UAC2_CS_CONTROL_SAM_FREQ << 8, snd_usb_ctrl_intf(chip) | (clock << 8), - data, sizeof(data))) < 0) { + &data, sizeof(data))) < 0) { snd_printk(KERN_ERR "%d:%d:%d: cannot set freq %d (v2)\n", dev->devnum, iface, fmt->altsetting, rate); return err; |